TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 17:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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(DIRTY, DirtyState.CLEAN.getId());
if (contact.isProfileSharingEnabled() && isInsert) {
if (contact.isProfileSharingEnabled() && isInsert && !profileName.isEmpty()) {
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);
familyName = StringUtil.trimToFit(familyName.trim(), ProfileName.MAX_PART_LENGTH);
if (givenName.isEmpty() && familyName.isEmpty()) {
return EMPTY;
}
return new ProfileName(givenName, familyName);
}