Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed sending image via chat while in call

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-28 13:56:46 +02:00
parent a0f044fa10
commit 4eb1f827d8
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/android/org/linphone/activities/LinphoneActivity.java
View file

@ -1379,6 +1379,10 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
super.onRestoreInstanceState(savedInstanceState); super.onRestoreInstanceState(savedInstanceState);
} }
public void disableGoToCall() {
doNotGoToCallActivity = true;
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();

1
src/android/org/linphone/chat/GroupChatFragment.java
View file

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