empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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) { public boolean matches(@Nullable SelectedContact other) {
if (other == null) return false; if (other == null) return false;
return recipientId != null && recipientId.equals(other.recipientId) || if (recipientId != null && other.recipientId != null) {
number != null && number .equals(other.number) || return recipientId.equals(other.recipientId);
}
return number != null && number .equals(other.number) ||
username != null && username.equals(other.username); username != null && username.equals(other.username);
} }
} }

6
app/src/test/java/org/thoughtcrime/securesms/contacts/SelectedContactSetTest.java
View file

@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts;
import org.junit.Test; import org.junit.Test;
import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientId;
import static edu.emory.mathcs.backport.java.util.Collections.singletonList;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
@ -92,13 +92,13 @@ public final class SelectedContactSetTest {
SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000"); SelectedContact contact1 = SelectedContact.forPhone(RecipientId.from(1), "+1-555-000-0000");
SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice"); SelectedContact contact2 = SelectedContact.forUsername(RecipientId.from(2), "@alice");
SelectedContact contact3 = SelectedContact.forUsername(null, "@bob"); SelectedContact contact3 = SelectedContact.forUsername(null, "@bob");
SelectedContact contact2Remove = SelectedContact.forUsername(RecipientId.from(1), "@alice"); SelectedContact contact2Remove = SelectedContact.forUsername(RecipientId.from(1), "@bob");
assertTrue(selectedContactSet.add(contact1)); assertTrue(selectedContactSet.add(contact1));
assertTrue(selectedContactSet.add(contact2)); assertTrue(selectedContactSet.add(contact2));
assertTrue(selectedContactSet.add(contact3)); assertTrue(selectedContactSet.add(contact3));
assertEquals(2, selectedContactSet.remove(contact2Remove)); assertEquals(2, selectedContactSet.remove(contact2Remove));
assertThat(selectedContactSet.getContacts(), is(singletonList(contact3))); assertThat(selectedContactSet.getContacts(), is(singletonList(contact2)));
} }
} }