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

Fixed 1 to 1 group chat creation

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-07 12:21:11 +01:00
parent e9738bc6c9
commit edd0bd8dde
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -339,12 +339,12 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
if (chatRoom == null) { if (chatRoom == null) {
ProxyConfig lpc = lc.getDefaultProxyConfig(); ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null && lpc.getConferenceFactoryUri() != null) { 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 = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
mChatRoom.addListener(mChatRoomCreationListener); mChatRoom.addListener(mChatRoomCreationListener);
mChatRoom.addParticipant(participant); mChatRoom.addParticipant(participant);
} else {
chatRoom = lc.getChatRoom(participant);
LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asStringUriOnly());
} }
} else { } else {
LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asStringUriOnly()); LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asStringUriOnly());

6
src/android/org/linphone/contacts/ContactDetailsFragment.java
View file

@ -80,13 +80,13 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
} else { } else {
ProxyConfig lpc = lc.getDefaultProxyConfig(); ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null && lpc.getConferenceFactoryUri() != null) { if (lpc != null && lpc.getConferenceFactoryUri() != null) {
room = lc.getChatRoom(participant);
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
} else {
mWaitLayout.setVisibility(View.VISIBLE); mWaitLayout.setVisibility(View.VISIBLE);
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
mChatRoom.addListener(mChatRoomCreationListener); mChatRoom.addListener(mChatRoomCreationListener);
mChatRoom.addParticipant(participant); mChatRoom.addParticipant(participant);
} else {
room = lc.getChatRoom(participant);
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
} }
} }
} }

6
src/android/org/linphone/fragments/HistoryDetailFragment.java
View file

@ -202,13 +202,13 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
} else { } else {
ProxyConfig lpc = lc.getDefaultProxyConfig(); ProxyConfig lpc = lc.getDefaultProxyConfig();
if (lpc != null && lpc.getConferenceFactoryUri() != null) { if (lpc != null && lpc.getConferenceFactoryUri() != null) {
room = lc.getChatRoom(participant);
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
} else {
mWaitLayout.setVisibility(View.VISIBLE); mWaitLayout.setVisibility(View.VISIBLE);
mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject)); mChatRoom = lc.createClientGroupChatRoom(getString(R.string.dummy_group_chat_subject));
mChatRoom.addListener(mChatRoomCreationListener); mChatRoom.addListener(mChatRoomCreationListener);
mChatRoom.addParticipant(participant); mChatRoom.addParticipant(participant);
} else {
room = lc.getChatRoom(participant);
LinphoneActivity.instance().goToChat(room.getPeerAddress().asStringUriOnly());
} }
} }
} else if (id == R.id.add_contact) { } else if (id == R.id.add_contact) {