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

Fixed fragment history when navigating between ChatCreation & GroupInfo

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-24 17:34:19 +02:00
parent cb4051c9ff
commit 562b4d5e2b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -721,7 +721,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
} }
} }
public void goToChatCreator(ArrayList<ContactAddress> selectedContacts) { public void goToChatCreator(ArrayList<ContactAddress> selectedContacts, boolean isGoBack) {
if (currentFragment == FragmentsAvailable.INFO_GROUP_CHAT && isGoBack) {
getFragmentManager().popBackStackImmediate();
getFragmentManager().popBackStackImmediate();
}
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putSerializable("selectedContacts", selectedContacts); extras.putSerializable("selectedContacts", selectedContacts);
changeCurrentFragment(FragmentsAvailable.CREATE_CHAT, extras); changeCurrentFragment(FragmentsAvailable.CREATE_CHAT, extras);

2
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -331,7 +331,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
enabledDeleteButton(false); enabledDeleteButton(false);
} }
else if (id == R.id.new_discussion) { else if (id == R.id.new_discussion) {
LinphoneActivity.instance().goToChatCreator(null); LinphoneActivity.instance().goToChatCreator(null, false);
/*String sipUri = fastNewChat.getText().toString(); /*String sipUri = fastNewChat.getText().toString();
if (sipUri.equals("")) { if (sipUri.equals("")) {
LinphoneActivity.instance().displayContacts(true); LinphoneActivity.instance().displayContacts(true);

8
src/android/org/linphone/chat/GroupInfoFragment.java
View file

@ -84,7 +84,7 @@ public class GroupInfoFragment extends Fragment {
mBackButton.setOnClickListener(new View.OnClickListener() { mBackButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { 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() { mAddParticipantsButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (mIsAlreadyCreatedGroup) { LinphoneActivity.instance().goToChatCreator(mParticipants, !mIsAlreadyCreatedGroup);
//TODO
} else {
LinphoneActivity.instance().goToChatCreator(mParticipants);
}
} }
}); });