mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 19:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix composing in chatroom

Browse source
This commit is contained in:
Erwan Croze 2018-09-17 13:51:10 +02:00
parent 6b8bc034c1
commit b2c3c72ed7
1 changed files with 53 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,6 +259,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
initChatRoom();
displayChatRoomHeader();
displayChatRoomHistory();
displayRemoteComposing(null);
LinphoneManager.getInstance().setCurrentChatRoomAddress(mRemoteSipAddress);
}
@ -270,6 +271,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
initChatRoom();
displayChatRoomHeader();
displayChatRoomHistory();
displayRemoteComposing(null);
LinphoneManager.getInstance().setCurrentChatRoomAddress(mRemoteSipAddress);
}
@ -527,6 +529,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
mBackToCallButton.setVisibility(View.GONE);
mCallButton.setVisibility(View.VISIBLE);
}
ChatRoomSecurityLevel level = mChatRoom.getSecurityLevel();
if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
mGroupInfosButton.setVisibility(View.GONE);
@ -577,6 +580,55 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
if (mChatRoom.hasBeenLeft()) {
setReadOnly();
}
}
public void displayRemoteComposing(Address remoteAddr) {
ArrayList<String> composing = new ArrayList<>();
for (Address a : mChatRoom.getComposingAddresses()) {
boolean found = false;
for (LinphoneContact c : mParticipants) {
if (c.hasAddress(a.asStringUriOnly())) {
composing.add(c.getFullName());
found = true;
break;
}
}
if (!found && remoteAddr != null) {
LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(remoteAddr);
String displayName;
if (contact != null) {
if (contact.getFullName() != null) {
displayName = contact.getFullName();
} else {
displayName = LinphoneUtils.getAddressDisplayName(remoteAddr);
}
} else {
displayName = LinphoneUtils.getAddressDisplayName(a);
}
composing.add(displayName);
}
}
mRemoteComposing.setVisibility(View.VISIBLE);
mParticipantsLabel.setVisibility(View.GONE);
if (composing.size() == 0) {
mRemoteComposing.setVisibility(View.GONE);
if (!mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) mParticipantsLabel.setVisibility(View.VISIBLE);
} else if (composing.size() == 1) {
mRemoteComposing.setText(getString(R.string.remote_composing_single).replace("%s", composing.get(0)));
} else {
StringBuilder remotes = new StringBuilder();
int i = 0;
for (String remote : composing) {
remotes.append(remote);
i++;
if (i != composing.size()) {
remotes.append(", ");
}
}
mRemoteComposing.setText(getString(R.string.remote_composing_multiple).replace("%s", remotes.toString()));
}
}
private void displayChatRoomHistory() {
@ -832,51 +884,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
@Override
public void onIsComposingReceived(ChatRoom cr, Address remoteAddr, boolean isComposing) {
ArrayList<String> composing = new ArrayList<>();
for (Address a : cr.getComposingAddresses()) {
boolean found = false;
for (LinphoneContact c : mParticipants) {
if (c.hasAddress(a.asStringUriOnly())) {
composing.add(c.getFullName());
found = true;
break;
}
}
if (!found) {
LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(remoteAddr);
String displayName;
if (contact != null) {
if (contact.getFullName() != null) {
displayName = contact.getFullName();
} else {
displayName = LinphoneUtils.getAddressDisplayName(remoteAddr);
}
} else {
displayName = LinphoneUtils.getAddressDisplayName(a);
}
composing.add(displayName);
}
}
mRemoteComposing.setVisibility(View.VISIBLE);
mParticipantsLabel.setVisibility(View.GONE);
if (composing.size() == 0) {
mRemoteComposing.setVisibility(View.GONE);
if (!mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) mParticipantsLabel.setVisibility(View.VISIBLE);
} else if (composing.size() == 1) {
mRemoteComposing.setText(getString(R.string.remote_composing_single).replace("%s", composing.get(0)));
} else {
StringBuilder remotes = new StringBuilder();
int i = 0;
for (String remote : composing) {
remotes.append(remote);
i++;
if (i != composing.size()) {
remotes.append(", ");
}
}
mRemoteComposing.setText(getString(R.string.remote_composing_multiple).replace("%s", remotes.toString()));
}
displayRemoteComposing(remoteAddr);
}
@Override