TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-03-30 19:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor refactor

Browse Source
This commit is contained in:
ryanzhao 2021-05-12 16:27:40 +10:00
parent 1e3ff1e6a1
commit d5a57c7dc8
1 changed files with 7 additions and 4 deletions

11
app/src/main/java/org/thoughtcrime/securesms/loki/views/ConversationView.kt

@ -9,6 +9,7 @@ import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout
import kotlinx.android.synthetic.main.view_conversation.view.* import kotlinx.android.synthetic.main.view_conversation.view.*
import network.loki.messenger.R import network.loki.messenger.R
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.SSKEnvironment
import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.database.model.ThreadRecord import org.thoughtcrime.securesms.database.model.ThreadRecord
@ -57,7 +58,7 @@ class ConversationView : LinearLayout {
} }
profilePictureView.glide = glide profilePictureView.glide = glide
profilePictureView.update(thread.recipient, thread.threadId) profilePictureView.update(thread.recipient, thread.threadId)
val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else SSKEnvironment.shared.profileManager.getDisplayName(context, thread.recipient) ?: thread.recipient.address.toString() val senderDisplayName = getUserDisplayName(thread.recipient) ?: thread.recipient.address.toString()
btnGroupNameDisplay.text = senderDisplayName btnGroupNameDisplay.text = senderDisplayName
timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date) timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE
@ -86,9 +87,11 @@ class ConversationView : LinearLayout {
profilePictureView.recycle() profilePictureView.recycle()
} }
private fun getUserDisplayName(publicKey: String?): String? { private fun getUserDisplayName(recipient: Recipient): String? {
if (TextUtils.isEmpty(publicKey)) return null if (recipient.isLocalNumber)
return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey!!) return context.getString(R.string.note_to_self)
else
return SSKEnvironment.shared.profileManager.getDisplayName(context, recipient)
} }
// endregion // endregion
} }