TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean

Browse Source
This commit is contained in:
Niels Andriesse 2020-02-11 11:36:31 +11:00
parent 73c33ff096
commit 18ee21355c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/notifications/NotificationUtilities.kt
View File

@ -9,14 +9,10 @@ fun getOpenGroupDisplayName(recipient: Recipient, threadRecipient: Recipient, co
val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(threadRecipient) val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(threadRecipient)
val publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID) val publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID)
val hexEncodedPublicKey = recipient.address.toString() val hexEncodedPublicKey = recipient.address.toString()
val displayName: String? val displayName = if (publicChat != null) {
displayName = if (publicChat != null) {
DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, hexEncodedPublicKey) DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, hexEncodedPublicKey)
} else { } else {
DatabaseFactory.getLokiUserDatabase(context).getDisplayName(hexEncodedPublicKey) DatabaseFactory.getLokiUserDatabase(context).getDisplayName(hexEncodedPublicKey)
} }
if (displayName == null) { return displayName ?: hexEncodedPublicKey
return hexEncodedPublicKey
}
return displayName
} }