TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 08:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix matches logic in contact selection.

Browse Source
This commit is contained in:
Alan Evans
2020-05-26 15:29:53 -03:00
committed by Greyson Parrelli
parent fe25d941bb
commit c5e7300df2
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContact.java
View File

@@ -43,13 +43,19 @@ public final class SelectedContact {
}
/**
* Returns true iff any non-null property matches one on the other contact.
* Returns true when non-null recipient ids match, and false if not.
* <p>
* If one or more recipient id is not set, then it returns true iff any other non-null property
* matches one on the other contact.
*/
public boolean matches(@Nullable SelectedContact other) {
if (other == null) return false;
return recipientId != null && recipientId.equals(other.recipientId) ||
number != null && number .equals(other.number) ||
username != null && username .equals(other.username);
if (recipientId != null && other.recipientId != null) {
return recipientId.equals(other.recipientId);
}
return number != null && number .equals(other.number) ||
username != null && username.equals(other.username);
}
}