Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional checks to chat-color processing.

Browse Source
This commit is contained in:
Alex Hart
2024-10-01 09:35:49 -03:00
committed by Greyson Parrelli
parent c5a13b392b
commit 88d1e7b40d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColors.kt
View File

@@ -148,9 +148,17 @@ class ChatColors(
}
companion object {
/**
* Converts a network chat color into our domain model object.
*
* Has additional protection to ensure that a rogue client can't send us a malformed
* color.
*/
@JvmStatic
fun forChatColor(id: Id, chatColor: ChatColor): ChatColors {
assert((chatColor.singleColor != null) xor (chatColor.linearGradient != null))
if (chatColor.singleColor == null && chatColor.linearGradient == null) {
return ChatColorsPalette.Bubbles.ULTRAMARINE
}
return if (chatColor.linearGradient != null) {
val linearGradient = LinearGradient(
@@ -160,10 +168,12 @@ class ChatColors(
)
forGradient(id, linearGradient)
} else {
val singleColor = chatColor.singleColor!!.color
} else if (chatColor.singleColor != null) {
val singleColor = chatColor.singleColor.color
forColor(id, singleColor)
} else {
ChatColorsPalette.Bubbles.ULTRAMARINE
}
}