From edd0bd8dde82f7b6f517331912518d6b7752488d Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 7 Mar 2018 12:21:11 +0100 Subject: [PATCH] Fixed 1 to 1 group chat creation --- src/android/org/linphone/chat/ChatCreationFragment.java | 6 +++--- .../org/linphone/contacts/ContactDetailsFragment.java | 6 +++--- .../org/linphone/fragments/HistoryDetailFragment.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java index 090099491..a419de846 100644 --- a/src/android/org/linphone/chat/ChatCreationFragment.java +++ b/src/android/org/linphone/chat/ChatCreationFragment.java @@ -339,12 +339,12 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen if (chatRoom == null) { ProxyConfig lpc = lc.getDefaultProxyConfig(); if (lpc != null && lpc.getConferenceFactoryUri() != null) { - chatRoom = lc.getChatRoom(participant); - LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asStringUriOnly()); - } else { mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); mChatRoom.addListener(mChatRoomCreationListener); mChatRoom.addParticipant(participant); + } else { + chatRoom = lc.getChatRoom(participant); + LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asStringUriOnly()); } } else { LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asStringUriOnly()); diff --git a/src/android/org/linphone/contacts/ContactDetailsFragment.java b/src/android/org/linphone/contacts/ContactDetailsFragment.java index 1a36353af..547ddbb5a 100644 --- a/src/android/org/linphone/contacts/ContactDetailsFragment.java +++ b/src/android/org/linphone/contacts/ContactDetailsFragment.java @@ -80,13 +80,13 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener } else { ProxyConfig lpc = lc.getDefaultProxyConfig(); if (lpc != null && lpc.getConferenceFactoryUri() != null) { - room = lc.getChatRoom(participant); - LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); - } else { mWaitLayout.setVisibility(View.VISIBLE); mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); mChatRoom.addListener(mChatRoomCreationListener); mChatRoom.addParticipant(participant); + } else { + room = lc.getChatRoom(participant); + LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); } } } diff --git a/src/android/org/linphone/fragments/HistoryDetailFragment.java b/src/android/org/linphone/fragments/HistoryDetailFragment.java index b7c10e17e..b45e32b3d 100644 --- a/src/android/org/linphone/fragments/HistoryDetailFragment.java +++ b/src/android/org/linphone/fragments/HistoryDetailFragment.java @@ -202,13 +202,13 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { } else { ProxyConfig lpc = lc.getDefaultProxyConfig(); if (lpc != null && lpc.getConferenceFactoryUri() != null) { - room = lc.getChatRoom(participant); - LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); - } else { mWaitLayout.setVisibility(View.VISIBLE); mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); mChatRoom.addListener(mChatRoomCreationListener); mChatRoom.addParticipant(participant); + } else { + room = lc.getChatRoom(participant); + LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); } } } else if (id == R.id.add_contact) {