Fixed go to chat from call & add call / transfer call

src/android/org/linphone/activities/LinphoneActivity.java

@@ -154,7 +154,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
     private RelativeLayout sideMenuContent, quitLayout, defaultAccount;
     private ListView accountsList, sideMenuItemList;
     private ImageView menu;
-    private boolean doNotGoToCallActivity = false;
     private List<String> sideMenuItems;
     private boolean callTransfer = false;
     private boolean isOnBackground = false;
@@ -300,10 +299,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
         }
         mAlwaysChangingPhoneAngle = rotation;
 
-        Bundle extras = getIntent().getExtras();
+        onNewIntent(getIntent());
-        if (extras != null && extras.getBoolean("GoToChat", false)) {
-            onNewIntent(getIntent());
-        }
     }
 
     private void initButtons() {
@@ -1153,10 +1149,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
         } else if (resultCode == Activity.RESULT_FIRST_USER && requestCode == CALL_ACTIVITY) {
             getIntent().putExtra("PreviousActivity", CALL_ACTIVITY);
             callTransfer = data != null && data.getBooleanExtra("Transfer", false);
-            boolean chat = data != null && data.getBooleanExtra("chat", false);
-            if (chat) {
-                pendingFragmentTransaction = FragmentsAvailable.CHAT_LIST;
-            }
             if (LinphoneManager.getLc().getCallsNb() > 0) {
                 initInCallMenuLayout(callTransfer);
             } else {
@@ -1173,8 +1165,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
     @Override
     protected void onPause() {
-        getIntent().putExtra("PreviousActivity", 0);
-
         Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
         if (lc != null) {
             lc.removeListener(mListener);
@@ -1366,10 +1356,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
         super.onRestoreInstanceState(savedInstanceState);
     }
 
-    public void disableGoToCall() {
-        doNotGoToCallActivity = true;
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -1407,7 +1393,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
         LinphoneManager.getInstance().changeStatusToOnline();
 
-        if (getIntent().getIntExtra("PreviousActivity", 0) != CALL_ACTIVITY && !doNotGoToCallActivity) {
+        if (!getIntent().getBooleanExtra("DoNotGoToCallActivity", false)) {
             if (LinphoneManager.getLc().getCalls().length > 0) {
                 Call call = LinphoneManager.getLc().getCalls()[0];
                 Call.State onCallStateChanged = call.getState();
@@ -1432,7 +1418,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
             displayChat(null, null, intent.getStringExtra("fileShared"));
             intent.putExtra("fileShared", "");
         }
-        doNotGoToCallActivity = false;
         isOnBackground = false;
 
         if (intent != null) {
@@ -1482,13 +1467,17 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
         Bundle extras = intent.getExtras();
         if (extras != null && extras.getBoolean("GoToChat", false)) {
             String sipUri = extras.getString("ChatContactSipUri");
-            doNotGoToCallActivity = true;
+            intent.putExtra("DoNotGoToCallActivity", true);
-            displayChat(sipUri, null, null);
+            if (sipUri == null) {
+                goToChatList();
+            } else {
+                displayChat(sipUri, null, null);
+            }
         } else if (extras != null && extras.getBoolean("GoToHistory", false)) {
-            doNotGoToCallActivity = true;
+            intent.putExtra("DoNotGoToCallActivity", true);
             changeCurrentFragment(FragmentsAvailable.HISTORY_LIST, null);
         } else if (extras != null && extras.getBoolean("GoToInapp", false)) {
-            doNotGoToCallActivity = true;
+            intent.putExtra("DoNotGoToCallActivity", true);
             displayInapp();
         } else if (extras != null && extras.getBoolean("Notification", false)) {
             if (LinphoneManager.getLc().getCallsNb() > 0) {
@@ -1496,7 +1485,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
                 startIncallActivity(call);
             }
         } else if (extras != null && extras.getBoolean("StartCall", false)) {
-            boolean extraBool = extras.getBoolean("StartCall", false);
             if (CallActivity.isInstanciated()) {
                 CallActivity.instance().startIncomingCallActivity();
             } else {
@@ -1504,17 +1492,19 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
                 goToDialerFragment();
                 //startActivity(new Intent(this, CallIncomingActivity.class));
             }
+        } else if (extras != null && extras.getBoolean("Transfer", false)) {
+            intent.putExtra("DoNotGoToCallActivity", true);
         } else {
             DialerFragment dialerFragment = DialerFragment.instance();
             if (dialerFragment != null) {
                 if (extras != null && extras.containsKey("SipUriOrNumber")) {
                     if (getResources().getBoolean(R.bool.automatically_start_intercepted_outgoing_gsm_call)) {
-                        ((DialerFragment) dialerFragment).newOutgoingCall(extras.getString("SipUriOrNumber"));
+                        dialerFragment.newOutgoingCall(extras.getString("SipUriOrNumber"));
                     } else {
-                        ((DialerFragment) dialerFragment).displayTextInAddressBar(extras.getString("SipUriOrNumber"));
+                        dialerFragment.displayTextInAddressBar(extras.getString("SipUriOrNumber"));
                     }
                 } else {
-                    ((DialerFragment) dialerFragment).newOutgoingCall(intent);
+                    dialerFragment.newOutgoingCall(intent);
                 }
             } else {
                 if (extras != null && extras.containsKey("SipUriOrNumber")) {
@@ -1524,7 +1514,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
             }
             if (LinphoneManager.getLc().getCalls().length > 0) {
                 // If a call is ringing, start incomingcallactivity
-                Collection<Call.State> incoming = new ArrayList<Call.State>();
+                Collection<Call.State> incoming = new ArrayList<>();
                 incoming.add(Call.State.IncomingReceived);
                 if (LinphoneUtils.getCallsInState(LinphoneManager.getLc(), incoming).size() > 0) {
                     if (CallActivity.isInstanciated()) {
@@ -1535,6 +1525,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
                 }
             }
         }
+        setIntent(intent);
     }
 
     public boolean isOnBackground() {

src/android/org/linphone/call/CallActivity.java

@@ -1065,15 +1065,17 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 
     private void goBackToDialerAndDisplayTransferButton() {
         Intent intent = new Intent();
+        intent.setClass(this, LinphoneActivity.class);
         intent.putExtra("Transfer", true);
-        setResult(Activity.RESULT_FIRST_USER, intent);
+        startActivity(intent);
         finish();
     }
 
     private void goToChatList() {
         Intent intent = new Intent();
-        intent.putExtra("chat", true);
+        intent.setClass(this, LinphoneActivity.class);
-        setResult(Activity.RESULT_FIRST_USER, intent);
+        intent.putExtra("GoToChat", true);
+        startActivity(intent);
         finish();
     }
 

src/android/org/linphone/chat/GroupChatFragment.java

@@ -682,7 +682,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
         Intent chooserIntent = Intent.createChooser(galleryIntent, getString(R.string.image_picker_title));
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, cameraIntents.toArray(new Parcelable[]{}));
 
-        LinphoneActivity.instance().disableGoToCall();
         startActivityForResult(chooserIntent, ADD_PHOTO);
     }