From 4eb1f827d88eac23ad8533f48632618d94a2e472 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 28 Mar 2018 13:56:46 +0200 Subject: [PATCH] Fixed sending image via chat while in call --- src/android/org/linphone/activities/LinphoneActivity.java | 4 ++++ src/android/org/linphone/chat/GroupChatFragment.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java index 1b781099a..1483a8cc0 100644 --- a/src/android/org/linphone/activities/LinphoneActivity.java +++ b/src/android/org/linphone/activities/LinphoneActivity.java @@ -1379,6 +1379,10 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick super.onRestoreInstanceState(savedInstanceState); } + public void disableGoToCall() { + doNotGoToCallActivity = true; + } + @Override protected void onResume() { super.onResume(); diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index 076bddd50..e1ef20817 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -485,6 +485,7 @@ 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); }