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

Do not set color before profile name is known.

Browse source
This commit is contained in:
Alan Evans 2020-09-22 14:09:48 -03:00 • committed by Greyson Parrelli
parent 74e94f3a97
commit a05f74d302
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View file

@ -999,7 +999,7 @@ public class RecipientDatabase extends Database {
values.put(STORAGE_SERVICE_ID, Base64.encodeBytes(contact.getId().getRaw())); values.put(STORAGE_SERVICE_ID, Base64.encodeBytes(contact.getId().getRaw()));
values.put(DIRTY, DirtyState.CLEAN.getId()); values.put(DIRTY, DirtyState.CLEAN.getId());
if (contact.isProfileSharingEnabled() && isInsert) { if (contact.isProfileSharingEnabled() && isInsert && !profileName.isEmpty()) {
values.put(COLOR, ContactColors.generateFor(profileName.toString()).serialize()); values.put(COLOR, ContactColors.generateFor(profileName.toString()).serialize());
} }

4
app/src/main/java/org/thoughtcrime/securesms/profiles/ProfileName.java
View file

@ -99,6 +99,10 @@ public final class ProfileName implements Parcelable {
givenName = StringUtil.trimToFit(givenName.trim(), ProfileName.MAX_PART_LENGTH); givenName = StringUtil.trimToFit(givenName.trim(), ProfileName.MAX_PART_LENGTH);
familyName = StringUtil.trimToFit(familyName.trim(), ProfileName.MAX_PART_LENGTH); familyName = StringUtil.trimToFit(familyName.trim(), ProfileName.MAX_PART_LENGTH);
if (givenName.isEmpty() && familyName.isEmpty()) {
return EMPTY;
}
return new ProfileName(givenName, familyName); return new ProfileName(givenName, familyName);
} }

10
app/src/test/java/org/thoughtcrime/securesms/profiles/ProfileNameTest.java
View file

@ -20,6 +20,7 @@ public final class ProfileNameTest {
assertFalse("ProfileName should not be CJKV", profileName.isProfileNameCJKV()); assertFalse("ProfileName should not be CJKV", profileName.isProfileNameCJKV());
assertEquals("ProfileName should have empty given name", "", profileName.getGivenName()); assertEquals("ProfileName should have empty given name", "", profileName.getGivenName());
assertEquals("ProfileName should have empty family name", "", profileName.getFamilyName()); assertEquals("ProfileName should have empty family name", "", profileName.getFamilyName());
assertTrue(profileName.isEmpty());
} }
@Test @Test
@ -31,6 +32,15 @@ public final class ProfileNameTest {
assertSame(ProfileName.EMPTY, profileName); assertSame(ProfileName.EMPTY, profileName);
} }
@Test
public void givenProfileNameWithNulls_thenIExpectExactlyEmpty() {
// GIVEN
ProfileName profileName = ProfileName.fromParts(null, null);
// THEN
assertSame(ProfileName.EMPTY, profileName);
}
@Test @Test
public void givenProfileNameWithGivenNameOnly_whenIFromDataString_thenIExpectValidProfileName() { public void givenProfileNameWithGivenNameOnly_whenIFromDataString_thenIExpectValidProfileName() {
// GIVEN // GIVEN