Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Utilize themed colors in fallback resource photos.

Browse Source
This commit is contained in:
Alex Hart
2022-08-26 13:40:12 -03:00
parent e7dbc874bb
commit 0b0c4eb8c0
4 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
View File

@@ -3785,6 +3785,8 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
val recipientId = RecipientId.from(cursor.requireLong(idColumnName))
val capabilities = cursor.requireLong(CAPABILITIES)
val distributionListId: DistributionListId? = DistributionListId.fromNullable(cursor.requireLong(DISTRIBUTION_LIST_ID))
val avatarColor: AvatarColor = if (distributionListId != null) AvatarColor.UNKNOWN else AvatarColor.deserialize(cursor.requireString(AVATAR_COLOR))
return RecipientRecord(
id = recipientId,
@@ -3794,7 +3796,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
e164 = cursor.requireString(PHONE),
email = cursor.requireString(EMAIL),
groupId = GroupId.parseNullableOrThrow(cursor.requireString(GROUP_ID)),
distributionListId = DistributionListId.fromNullable(cursor.requireLong(DISTRIBUTION_LIST_ID)),
distributionListId = distributionListId,
groupType = GroupType.fromId(cursor.requireInt(GROUP_TYPE)),
isBlocked = cursor.requireBoolean(BLOCKED),
muteUntil = cursor.requireLong(MUTE_UNTIL),
@@ -3832,7 +3834,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
mentionSetting = MentionSetting.fromId(cursor.requireInt(MENTION_SETTING)),
wallpaper = chatWallpaper,
chatColors = chatColors,
avatarColor = AvatarColor.deserialize(cursor.requireString(AVATAR_COLOR)),
avatarColor = avatarColor,
about = cursor.requireString(ABOUT),
aboutEmoji = cursor.requireString(ABOUT_EMOJI),
syncExtras = getSyncExtras(cursor),