diff --git a/src/android/org/linphone/contacts/ContactDetailsFragment.java b/src/android/org/linphone/contacts/ContactDetailsFragment.java index 1daa23cb9..5fd8f1040 100644 --- a/src/android/org/linphone/contacts/ContactDetailsFragment.java +++ b/src/android/org/linphone/contacts/ContactDetailsFragment.java @@ -77,26 +77,21 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); } else { mWaitLayout.setVisibility(View.VISIBLE); - room = lc.findOneToOneChatRoom(lc.getDefaultProxyConfig().getContact(), participant); - if (room == null) { - room = LinphoneManager.getLc().createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); - room.setListener(new ChatRoomListenerStub() { - @Override - public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { - if (newState == ChatRoom.State.Created) { - mWaitLayout.setVisibility(View.GONE); - LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly()); - } else if (newState == ChatRoom.State.CreationFailed) { - mWaitLayout.setVisibility(View.GONE); - LinphoneActivity.instance().displayChatRoomError(); - Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !"); - } + room = LinphoneManager.getLc().createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); + room.setListener(new ChatRoomListenerStub() { + @Override + public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { + if (newState == ChatRoom.State.Created) { + mWaitLayout.setVisibility(View.GONE); + LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly()); + } else if (newState == ChatRoom.State.CreationFailed) { + mWaitLayout.setVisibility(View.GONE); + LinphoneActivity.instance().displayChatRoomError(); + Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !"); } - }); - room.addParticipant(participant); - } else { - LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); - } + } + }); + room.addParticipant(participant); } } } diff --git a/src/android/org/linphone/fragments/HistoryDetailFragment.java b/src/android/org/linphone/fragments/HistoryDetailFragment.java index ca270bfc1..5d290f339 100644 --- a/src/android/org/linphone/fragments/HistoryDetailFragment.java +++ b/src/android/org/linphone/fragments/HistoryDetailFragment.java @@ -176,26 +176,21 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); } else { mWaitLayout.setVisibility(View.VISIBLE); - room = lc.findOneToOneChatRoom(lc.getDefaultProxyConfig().getContact(), participant); - if (room == null) { - room = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); - room.setListener(new ChatRoomListenerStub() { - @Override - public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { - if (newState == ChatRoom.State.Created) { - mWaitLayout.setVisibility(View.GONE); - LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly()); - } else if (newState == ChatRoom.State.CreationFailed) { - mWaitLayout.setVisibility(View.GONE); - LinphoneActivity.instance().displayChatRoomError(); - Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !"); - } + room = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); + room.setListener(new ChatRoomListenerStub() { + @Override + public void onStateChanged(ChatRoom cr, ChatRoom.State newState) { + if (newState == ChatRoom.State.Created) { + mWaitLayout.setVisibility(View.GONE); + LinphoneActivity.instance().goToChat(cr.getPeerAddress().asStringUriOnly()); + } else if (newState == ChatRoom.State.CreationFailed) { + mWaitLayout.setVisibility(View.GONE); + LinphoneActivity.instance().displayChatRoomError(); + Log.e("Group chat room for address " + cr.getPeerAddress() + " has failed !"); } - }); - room.addParticipant(participant); - } else { - LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly()); - } + } + }); + room.addParticipant(participant); } } else if (id == R.id.add_contact) { Address addr = Factory.instance().createAddress(sipUri);