From 562b4d5e2b38f79e4b501565acc04f63e44ce1fd Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 24 Oct 2017 17:34:19 +0200 Subject: [PATCH] Fixed fragment history when navigating between ChatCreation & GroupInfo --- src/android/org/linphone/activities/LinphoneActivity.java | 6 +++++- src/android/org/linphone/chat/ChatListFragment.java | 2 +- src/android/org/linphone/chat/GroupInfoFragment.java | 8 ++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java index 633ab9335..998459c11 100644 --- a/src/android/org/linphone/activities/LinphoneActivity.java +++ b/src/android/org/linphone/activities/LinphoneActivity.java @@ -721,7 +721,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick } } - public void goToChatCreator(ArrayList selectedContacts) { + public void goToChatCreator(ArrayList selectedContacts, boolean isGoBack) { + if (currentFragment == FragmentsAvailable.INFO_GROUP_CHAT && isGoBack) { + getFragmentManager().popBackStackImmediate(); + getFragmentManager().popBackStackImmediate(); + } Bundle extras = new Bundle(); extras.putSerializable("selectedContacts", selectedContacts); changeCurrentFragment(FragmentsAvailable.CREATE_CHAT, extras); diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java index a087ca2ef..e2d2f63e1 100644 --- a/src/android/org/linphone/chat/ChatListFragment.java +++ b/src/android/org/linphone/chat/ChatListFragment.java @@ -331,7 +331,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte enabledDeleteButton(false); } else if (id == R.id.new_discussion) { - LinphoneActivity.instance().goToChatCreator(null); + LinphoneActivity.instance().goToChatCreator(null, false); /*String sipUri = fastNewChat.getText().toString(); if (sipUri.equals("")) { LinphoneActivity.instance().displayContacts(true); diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java index 794e7509d..6f6dda09b 100644 --- a/src/android/org/linphone/chat/GroupInfoFragment.java +++ b/src/android/org/linphone/chat/GroupInfoFragment.java @@ -84,7 +84,7 @@ public class GroupInfoFragment extends Fragment { mBackButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - LinphoneActivity.instance().goToChatCreator(mParticipants); + LinphoneActivity.instance().goToChatCreator(mParticipants, true); } }); @@ -103,11 +103,7 @@ public class GroupInfoFragment extends Fragment { mAddParticipantsButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (mIsAlreadyCreatedGroup) { - //TODO - } else { - LinphoneActivity.instance().goToChatCreator(mParticipants); - } + LinphoneActivity.instance().goToChatCreator(mParticipants, !mIsAlreadyCreatedGroup); } });