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

Also use weakEquals on Addresses to prevent future issue

Browse source
This commit is contained in:
Sylvain Berfini 2018-04-12 10:37:44 +02:00
parent 04093860b5
commit f4f59cbae6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/chat/GroupInfoAdapter.java
View file

@ -129,7 +129,7 @@ public class GroupInfoAdapter extends BaseAdapter {
} else if (mChatRoom != null) { } else if (mChatRoom != null) {
boolean found = false; boolean found = false;
for (Participant p : mChatRoom.getParticipants()) { for (Participant p : mChatRoom.getParticipants()) {
if (p.getAddress().asStringUriOnly().equals(ca.getAddress().asStringUriOnly())) { if (p.getAddress().weakEqual(ca.getAddress())) {
found = true; found = true;
break; break;
} }

4
src/android/org/linphone/chat/GroupInfoFragment.java
View file

@ -249,7 +249,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
for (Participant p : mChatRoom.getParticipants()) { for (Participant p : mChatRoom.getParticipants()) {
boolean found = false; boolean found = false;
for (ContactAddress c : mParticipants) { for (ContactAddress c : mParticipants) {
if (c.getAddress().asStringUriOnly().equals(p.getAddress().asStringUriOnly())) { if (c.getAddress().weakEqual(p.getAddress())) {
found = true; found = true;
break; break;
} }
@ -267,7 +267,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
for (ContactAddress c : mParticipants) { for (ContactAddress c : mParticipants) {
boolean found = false; boolean found = false;
for (Participant p : mChatRoom.getParticipants()) { for (Participant p : mChatRoom.getParticipants()) {
if (p.getAddress().asStringUriOnly().equals(c.getAddress().asStringUriOnly())) { if (p.getAddress().weakEqual(c.getAddress())) {
// Admin rights // Admin rights
if (c.isAdmin() != p.isAdmin()) { if (c.isAdmin() != p.isAdmin()) {
mChatRoom.setParticipantAdminStatus(p, c.isAdmin()); mChatRoom.setParticipantAdminStatus(p, c.isAdmin());