From 86e8be31cdd2b01ce23c8b3c1caf1a12cfb73d98 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 15 Nov 2018 09:14:04 +0100 Subject: [PATCH] Fix add call participant switch view --- src/android/org/linphone/LinphoneManager.java | 4 ++-- .../org/linphone/activities/LinphoneActivity.java | 12 ++++++------ src/android/org/linphone/call/CallActivity.java | 8 +++----- .../org/linphone/call/CallIncomingActivity.java | 2 +- .../org/linphone/call/CallOutgoingActivity.java | 4 ++-- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index 450ec1f43..00c7e576f 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -805,7 +805,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou if (mLc.isIncomingInvitePending() && on) { handsetON = true; mLc.acceptCall(mLc.getCurrentCall()); - LinphoneActivity.instance().startIncallActivity(mLc.getCurrentCall()); + LinphoneActivity.instance().startIncallActivity(); } else if(on && CallActivity.isInstanciated()) { handsetON = true; CallActivity.instance().setSpeakerEnabled(true); @@ -1218,7 +1218,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou if (LinphoneManager.getInstance() != null) { LinphoneManager.getInstance().routeAudioToReceiver(); if (LinphoneActivity.instance() != null) - LinphoneActivity.instance().startIncallActivity(call); + LinphoneActivity.instance().startIncallActivity(); } } } diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java index 1e7439bc6..1ed278bec 100644 --- a/src/android/org/linphone/activities/LinphoneActivity.java +++ b/src/android/org/linphone/activities/LinphoneActivity.java @@ -1063,7 +1063,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick } } - public void startIncallActivity(Call currentCall) { + public void startIncallActivity() { Intent intent = new Intent(this, CallActivity.class); startOrientationSensor(); startActivityForResult(intent, CALL_ACTIVITY); @@ -1144,7 +1144,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick if (call.getState() == Call.State.IncomingReceived) { startActivity(new Intent(LinphoneActivity.this, CallIncomingActivity.class)); } else { - startIncallActivity(call); + startIncallActivity(); } } } @@ -1465,7 +1465,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick } else if (onCallStateChanged == State.OutgoingInit || onCallStateChanged == State.OutgoingProgress || onCallStateChanged == State.OutgoingRinging) { startActivity(new Intent(this, CallOutgoingActivity.class)); } else { - startIncallActivity(call); + startIncallActivity(); } } } @@ -1543,8 +1543,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick displayInapp(); } else if (extras != null && extras.getBoolean("Notification", false)) { if (LinphoneManager.getLc().getCallsNb() > 0) { - Call call = LinphoneManager.getLc().getCalls()[0]; - startIncallActivity(call); + startIncallActivity(); } }else if (extras != null && extras.getBoolean("StartCall", false)) { if (CallActivity.isInstanciated()) { @@ -1552,10 +1551,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick } else { mAddressWaitingToBeCalled = extras.getString("NumberToCall"); goToDialerFragment(); - //startActivity(new Intent(this, CallIncomingActivity.class)); } } else if (extras != null && extras.getBoolean("Transfer", false)) { intent.putExtra("DoNotGoToCallActivity", true); + } else if (extras != null && extras.getBoolean("AddCall", false)) { + intent.putExtra("DoNotGoToCallActivity", true); } else { DialerFragment dialerFragment = DialerFragment.instance(); if (dialerFragment != null) { diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index 003b6d5b1..2dd0c78cf 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -1120,9 +1120,9 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList public void goBackToDialer() { Intent intent = new Intent(); - intent.putExtra("Transfer", false); - setResult(Activity.RESULT_FIRST_USER, intent); - finish(); + intent.setClass(this, LinphoneActivity.class); + intent.putExtra("AddCall", true); + startActivity(intent); } private void goBackToDialerAndDisplayTransferButton() { @@ -1130,7 +1130,6 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList intent.setClass(this, LinphoneActivity.class); intent.putExtra("Transfer", true); startActivity(intent); - finish(); } private void goToChatList() { @@ -1138,7 +1137,6 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList intent.setClass(this, LinphoneActivity.class); intent.putExtra("GoToChat", true); startActivity(intent); - finish(); } public void acceptCallUpdate(boolean accept) { diff --git a/src/android/org/linphone/call/CallIncomingActivity.java b/src/android/org/linphone/call/CallIncomingActivity.java index 8fbb312ae..cc8744aa1 100644 --- a/src/android/org/linphone/call/CallIncomingActivity.java +++ b/src/android/org/linphone/call/CallIncomingActivity.java @@ -356,7 +356,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin return; } LinphoneManager.getInstance().routeAudioToReceiver(); - LinphoneActivity.instance().startIncallActivity(mCall); + LinphoneActivity.instance().startIncallActivity(); } } diff --git a/src/android/org/linphone/call/CallOutgoingActivity.java b/src/android/org/linphone/call/CallOutgoingActivity.java index 3361abdca..44ef365d6 100644 --- a/src/android/org/linphone/call/CallOutgoingActivity.java +++ b/src/android/org/linphone/call/CallOutgoingActivity.java @@ -118,7 +118,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC if (!LinphoneActivity.isInstanciated()) { return; } - LinphoneActivity.instance().startIncallActivity(mCall); + LinphoneActivity.instance().startIncallActivity(); finish(); return; } else if (state == State.Error) { @@ -181,7 +181,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC if (!LinphoneActivity.isInstanciated()) { return; } - LinphoneActivity.instance().startIncallActivity(mCall); + LinphoneActivity.instance().startIncallActivity(); finish(); return; }