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

Workaround to allow client group chat with 1 participant without being one to one

Browse source
This commit is contained in:
Sylvain Berfini 2019-02-14 11:40:15 +01:00
parent ac2ddf83b4
commit b96ef0ecc6
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -1083,7 +1083,7 @@ public class ChatMessagesFragment extends Fragment
split = true; split = true;
// Allow the last image to be sent with text if image and text at the same time OK // Allow the last image to be sent with text if image and text at the same time OK
if (hasText && !sendImageAndTextAsDifferentMessages && i == filesCount - 1) { if (hasText && i == filesCount - 1) {
split = false; split = false;
} }
} }

6
app/src/main/java/org/linphone/chat/GroupInfoFragment.java
View file

@ -329,6 +329,11 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
mIsEncryptionEnabled); mIsEncryptionEnabled);
mTempChatRoom.addListener(mChatRoomCreationListener); mTempChatRoom.addListener(mChatRoomCreationListener);
if (mParticipants.size() == 1) {
// Ugly hack until new client chat group API so we can have a group
// chat room with 1 participant without being one to one
mTempChatRoom.addParticipant(mParticipants.get(0).getAddress());
} else {
int i = 0; int i = 0;
Address[] participantsToAdd = new Address[mParticipants.size()]; Address[] participantsToAdd = new Address[mParticipants.size()];
for (ContactAddress ca : mParticipants) { for (ContactAddress ca : mParticipants) {
@ -336,6 +341,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
i++; i++;
} }
mTempChatRoom.addParticipants(participantsToAdd); mTempChatRoom.addParticipants(participantsToAdd);
}
} else { } else {
// Subject // Subject
String newSubject = mSubjectField.getText().toString(); String newSubject = mSubjectField.getText().toString();