[SES-2512] Rewrite ProfilePictureView

app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt

@@ -27,8 +27,8 @@ import network.loki.messenger.R
 import network.loki.messenger.databinding.ActivityWebrtcBinding
 import org.apache.commons.lang3.time.DurationFormatUtils
 import org.session.libsession.messaging.contacts.Contact
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.truncateIdForDisplay
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
@@ -194,13 +194,8 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
         clipFloatingInsets()
 
         // set up the user avatar
-        TextSecurePreferences.getLocalNumber(this)?.let{
-            val username = TextSecurePreferences.getProfileName(this) ?: truncateIdForDisplay(it)
-            binding.userAvatar.apply {
-                publicKey = it
-                displayName = username
-                update()
-            }
+        TextSecurePreferences.getLocalNumber(this)?.let {
+            binding.userAvatar.load(Address.fromSerialized(it))
         }
     }
 
@@ -332,20 +327,14 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
 
             launch {
                 viewModel.recipient.collect { latestRecipient ->
-                    binding.contactAvatar.recycle()
-
                     if (latestRecipient.recipient != null) {
                         val contactPublicKey = latestRecipient.recipient.address.serialize()
                         val contactDisplayName = getUserDisplayName(contactPublicKey)
                         supportActionBar?.title = contactDisplayName
                         binding.remoteRecipientName.text = contactDisplayName
 
                         // sort out the contact's avatar
-                        binding.contactAvatar.apply {
-                            publicKey = contactPublicKey
-                            displayName = contactDisplayName
-                            update()
-                        }
+                        binding.contactAvatar.load(latestRecipient.recipient)
                     }
                 }
             }

app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt

@@ -53,7 +53,7 @@ class UserView : LinearLayout {
             return contact?.displayName(Contact.ContactContext.REGULAR) ?: publicKey
         }
         val address = user.address.serialize()
-        binding.profilePictureView.update(user)
+        binding.profilePictureView.load(user)
         binding.actionIndicatorImageView.setImageResource(R.drawable.ic_baseline_edit_24)
         binding.nameTextView.text = if (user.isGroupRecipient) user.name else getUserDisplayName(address)
         when (actionIndicator) {
@@ -85,7 +85,6 @@ class UserView : LinearLayout {
     }
 
     fun unbind() {
-        binding.profilePictureView.recycle()
     }
     // endregion
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActionBarView.kt

@@ -81,7 +81,7 @@ class ConversationActionBarView @JvmOverloads constructor(
     }
 
     fun update(recipient: Recipient, openGroup: OpenGroup? = null, config: ExpirationConfiguration? = null) {
-        binding.profilePictureView.update(recipient)
+        binding.profilePictureView.load(recipient)
         binding.conversationTitleView.text = recipient.takeUnless { it.isLocalNumber }?.toShortString() ?: context.getString(R.string.note_to_self)
         updateSubtitle(recipient, openGroup, config)
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt

@@ -27,6 +27,7 @@ import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import com.bumptech.glide.RequestManager
+import org.thoughtcrime.securesms.database.getLong
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
 import org.thoughtcrime.securesms.showSessionDialog
 import java.util.concurrent.atomic.AtomicLong

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidateView.kt

@@ -2,13 +2,11 @@ package org.thoughtcrime.securesms.conversation.v2.input_bar.mentions
 
 import android.view.View
 import network.loki.messenger.databinding.ViewMentionCandidateV2Binding
+import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.conversation.v2.mention.MentionViewModel
 
 fun ViewMentionCandidateV2Binding.update(candidate: MentionViewModel.Candidate) {
     mentionCandidateNameTextView.text = candidate.nameHighlighted
-    profilePictureView.publicKey = candidate.member.publicKey
-    profilePictureView.displayName = candidate.member.name
-    profilePictureView.additionalPublicKey = null
-    profilePictureView.update()
+    profilePictureView.load(Address.fromSerialized(candidate.member.publicKey))
     moderatorIconImageView.visibility = if (candidate.member.isModerator) View.VISIBLE else View.GONE
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -16,7 +16,6 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.LinearLayout
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -26,6 +25,8 @@ import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
 import dagger.hilt.android.AndroidEntryPoint
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewEmojiReactionsBinding
@@ -52,8 +53,6 @@ import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.groups.OpenGroupManager
 import org.thoughtcrime.securesms.home.UserDetailsBottomSheet
-import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestManager
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.disableClipping
 import org.thoughtcrime.securesms.util.toDp
@@ -179,8 +178,7 @@ class VisibleMessageView : FrameLayout {
 
         if (isGroupThread && !message.isOutgoing) {
             if (isEndOfMessageCluster) {
-                binding.profilePictureView.publicKey = senderAccountID
-                binding.profilePictureView.update(message.individualRecipient)
+                binding.profilePictureView.load(message.individualRecipient)
                 binding.profilePictureView.setOnClickListener {
                     if (thread.isCommunityRecipient) {
                         val openGroup = lokiThreadDb.getOpenGroupChat(threadID)
@@ -456,7 +454,6 @@ class VisibleMessageView : FrameLayout {
     }
 
     fun recycle() {
-        binding.profilePictureView.recycle()
         binding.messageContentView.root.recycle()
     }
 

app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java

@@ -13,14 +13,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-class ContactPhotoFetcher implements DataFetcher<InputStream> {
+public class ContactPhotoFetcher implements DataFetcher<InputStream> {
 
   private final Context   context;
   private final ContactPhoto contactPhoto;
 
   private InputStream inputStream;
 
-  ContactPhotoFetcher(@NonNull Context context, @NonNull ContactPhoto contactPhoto) {
+  public ContactPhotoFetcher(@NonNull Context context, @NonNull ContactPhoto contactPhoto) {
     this.context      = context.getApplicationContext();
     this.contactPhoto = contactPhoto;
   }

app/src/main/java/org/thoughtcrime/securesms/glide/PlaceholderAvatarFetcher.kt

@@ -9,12 +9,15 @@ import org.session.libsession.avatars.PlaceholderAvatarPhoto
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator
 
-class PlaceholderAvatarFetcher(private val context: Context,
-                               private val photo: PlaceholderAvatarPhoto): DataFetcher<BitmapDrawable> {
+class PlaceholderAvatarFetcher(
+    private val context: Context,
+    private val hashString: String,
+    private val displayName: String
+): DataFetcher<BitmapDrawable> {
 
     override fun loadData(priority: Priority,callback: DataFetcher.DataCallback<in BitmapDrawable>) {
         try {
-            val avatar = AvatarPlaceholderGenerator.generate(context, 128, photo.hashString, photo.displayName)
+            val avatar = AvatarPlaceholderGenerator.generate(context, 128, hashString, displayName)
             callback.onDataReady(avatar)
         } catch (e: Exception) {
             Log.e("Loki", "Error in fetching avatar")

app/src/main/java/org/thoughtcrime/securesms/glide/PlaceholderAvatarLoader.kt

@@ -8,6 +8,9 @@ import com.bumptech.glide.load.model.ModelLoader.LoadData
 import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import org.session.libsession.avatars.PlaceholderAvatarPhoto
+import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.recipients.Recipient
 
 class PlaceholderAvatarLoader(private val appContext: Context): ModelLoader<PlaceholderAvatarPhoto, BitmapDrawable> {
 
@@ -17,7 +20,15 @@ class PlaceholderAvatarLoader(private val appContext: Context): ModelLoader<Plac
         height: Int,
         options: Options
     ): LoadData<BitmapDrawable> {
-        return LoadData(model, PlaceholderAvatarFetcher(appContext, model))
+        val displayName: String = when {
+            !model.displayName.isNullOrBlank() -> model.displayName.orEmpty()
+            model.hashString == TextSecurePreferences.getLocalNumber(appContext) -> TextSecurePreferences.getProfileName(appContext).orEmpty()
+            else -> Recipient.from(appContext, Address.fromSerialized(model.hashString), false).let {
+                it.profileName ?: it.name ?: ""
+            }
+        }
+
+        return LoadData(model, PlaceholderAvatarFetcher(appContext, model.hashString, displayName))
     }
 
     override fun handles(model: PlaceholderAvatarPhoto): Boolean = true

app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.res.Resources
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
-import android.text.TextUtils
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.View
@@ -128,11 +127,10 @@ class ConversationView : LinearLayout {
             thread.isRead -> binding.statusIndicatorImageView.setImageResource(R.drawable.ic_filled_circle_check)
             else -> binding.statusIndicatorImageView.setImageResource(R.drawable.ic_circle_check)
         }
-        binding.profilePictureView.update(thread.recipient)
+        binding.profilePictureView.load(thread.recipient)
     }
 
     fun recycle() {
-        binding.profilePictureView.recycle()
     }
 
     private fun getTitle(recipient: Recipient): String? = when {

app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt

@@ -347,8 +347,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         ApplicationContext.getInstance(this).messageNotifier.setHomeScreenVisible(true)
         if (textSecurePreferences.getLocalNumber() == null) { return; } // This can be the case after a secondary device is auto-cleared
         IdentityKeyUtil.checkUpdate(this)
-        binding.profileButton.recycle() // clear cached image before update tje profilePictureView
-        binding.profileButton.update()
+        binding.profileButton.load(Address.fromSerialized(publicKey))
         if (textSecurePreferences.getHasViewedSeed()) {
             binding.seedReminderView.isVisible = false
         }
@@ -388,10 +387,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
     }
 
     private fun updateProfileButton() {
-        binding.profileButton.publicKey = publicKey
-        binding.profileButton.displayName = textSecurePreferences.getProfileName()
-        binding.profileButton.recycle()
-        binding.profileButton.update()
+        binding.profileButton.load(Address.fromSerialized(publicKey))
     }
     // endregion
 

app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt

@@ -55,8 +55,7 @@ class UserDetailsBottomSheet: BottomSheetDialogFragment() {
         val recipient = Recipient.from(requireContext(), Address.fromSerialized(publicKey), false)
         val threadRecipient = threadDb.getRecipientForThreadId(threadID) ?: return dismiss()
         with(binding) {
-            profilePictureView.publicKey = publicKey
-            profilePictureView.update(recipient)
+            profilePictureView.load(recipient)
             nameTextViewContainer.visibility = View.VISIBLE
             nameTextViewContainer.setOnClickListener {
                 if (recipient.isOpenGroupInboxRecipient || recipient.isOpenGroupOutboxRecipient) return@setOnClickListener