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

Fixed back button when on a newly created chat room

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-31 10:58:45 +01:00
parent cdc6040451
commit 6d023ca54b
3 changed files with 9 additions and 12 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

@ -734,7 +734,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
changeCurrentFragment(FragmentsAvailable.GROUP_CHAT, extras); changeCurrentFragment(FragmentsAvailable.GROUP_CHAT, extras);
} }
public void displayChatGroupInfos(ArrayList<ContactAddress> contacts, String subject, boolean isAlreadyCreatedGroup, boolean isEditionEnabled) { public void goToChatGroupInfos(ArrayList<ContactAddress> contacts, String subject, boolean isAlreadyCreatedGroup, boolean isEditionEnabled) {
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putBoolean("isAlreadyCreatedGroup", isAlreadyCreatedGroup); extras.putBoolean("isAlreadyCreatedGroup", isAlreadyCreatedGroup);
extras.putBoolean("isEditionEnabled", isEditionEnabled); extras.putBoolean("isEditionEnabled", isEditionEnabled);
@ -743,6 +743,10 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
changeCurrentFragment(FragmentsAvailable.INFO_GROUP_CHAT, extras); changeCurrentFragment(FragmentsAvailable.INFO_GROUP_CHAT, extras);
} }
public void goToChatList() {
changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
}
public void displayChat(String sipUri, String message, String fileUri) { public void displayChat(String sipUri, String message, String fileUri) {
if (getResources().getBoolean(R.bool.disable_chat)) { if (getResources().getBoolean(R.bool.disable_chat)) {
return; return;

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

@ -280,7 +280,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", ""); LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", "");
} else { } else {
contactsSelectedLayout.removeAllViews(); contactsSelectedLayout.removeAllViews();
LinphoneActivity.instance().displayChatGroupInfos(contactsSelected, null, false, true); LinphoneActivity.instance().goToChatGroupInfos(contactsSelected, null, false, true);
} }
} else if (id == R.id.clearSearchField) { } else if (id == R.id.clearSearchField) {
searchField.setText(""); searchField.setText("");

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

@ -58,7 +58,6 @@ import org.linphone.contacts.ContactsManager;
import org.linphone.contacts.LinphoneContact; import org.linphone.contacts.LinphoneContact;
import org.linphone.core.Address; import org.linphone.core.Address;
import org.linphone.core.Buffer; import org.linphone.core.Buffer;
import org.linphone.core.Call;
import org.linphone.core.ChatMessage; import org.linphone.core.ChatMessage;
import org.linphone.core.ChatMessageListener; import org.linphone.core.ChatMessageListener;
import org.linphone.core.ChatRoom; import org.linphone.core.ChatRoom;
@ -69,7 +68,6 @@ import org.linphone.core.EventLog;
import org.linphone.core.Friend; import org.linphone.core.Friend;
import org.linphone.core.FriendList; import org.linphone.core.FriendList;
import org.linphone.core.Participant; import org.linphone.core.Participant;
import org.linphone.mediastream.Log;
import org.linphone.receivers.ContactsUpdatedListener; import org.linphone.receivers.ContactsUpdatedListener;
import java.io.File; import java.io.File;
@ -116,7 +114,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
mBackButton.setOnClickListener(new View.OnClickListener() { mBackButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
LinphoneActivity.instance().popBackStack(); LinphoneActivity.instance().goToChatList();
} }
}); });
@ -157,7 +155,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
ContactAddress ca = new ContactAddress(c, a.asString(), c.isFriend()); ContactAddress ca = new ContactAddress(c, a.asString(), c.isFriend());
participants.add(ca); participants.add(ca);
} }
LinphoneActivity.instance().displayChatGroupInfos(participants, mChatRoom.getSubject(), true, /*TODO*/ false); LinphoneActivity.instance().goToChatGroupInfos(participants, mChatRoom.getSubject(), true, /*TODO*/ false);
} }
}); });
@ -714,25 +712,21 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
@Override @Override
public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) { public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
mMessagesAdapter.addToHistory(event); mMessagesAdapter.addToHistory(event);
} }
@Override @Override
public void onParticipantDeviceRemoved(ChatRoom cr, EventLog event) { public void onParticipantDeviceRemoved(ChatRoom cr, EventLog event) {
mMessagesAdapter.addToHistory(event); mMessagesAdapter.addToHistory(event);
} }
@Override @Override
public void onParticipantRemoved(ChatRoom cr, EventLog event) { public void onParticipantRemoved(ChatRoom cr, EventLog event) {
mMessagesAdapter.addToHistory(event); mMessagesAdapter.addToHistory(event);
} }
@Override @Override
public void onParticipantDeviceAdded(ChatRoom cr, EventLog event) { public void onParticipantDeviceAdded(ChatRoom cr, EventLog event) {
mMessagesAdapter.addToHistory(event); mMessagesAdapter.addToHistory(event);
} }
@Override @Override
@ -743,13 +737,12 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
@Override @Override
public void onParticipantAdded(ChatRoom cr, EventLog event) { public void onParticipantAdded(ChatRoom cr, EventLog event) {
mMessagesAdapter.addToHistory(event); mMessagesAdapter.addToHistory(event);
} }
@Override @Override
public void onSubjectChanged(ChatRoom cr, EventLog event) { public void onSubjectChanged(ChatRoom cr, EventLog event) {
mMessagesAdapter.addToHistory(event); mMessagesAdapter.addToHistory(event);
mRoomLabel.setText(event.getSubject());
} }
@Override @Override