From 0d0089e3d6f25332960908fa77d22349b4a83d66 Mon Sep 17 00:00:00 2001
From: Harris <hjubb@users.noreply.github.com>
Date: Mon, 26 Jul 2021 13:44:04 +1000
Subject: [PATCH] refactor: visible message view and user details bottom sheet
 updates individual recipient. Remove "none" notifications style

---
 .../thoughtcrime/securesms/components/ProfilePictureView.kt | 6 +++---
 .../conversation/v2/messages/VisibleMessageView.kt          | 2 +-
 .../thoughtcrime/securesms/home/UserDetailsBottomSheet.kt   | 4 ++--
 app/src/main/res/values/arrays.xml                          | 1 -
 app/src/main/res/values/strings.xml                         | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
index 41e3f510ee..c3929a236d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
@@ -14,11 +14,11 @@ import org.session.libsession.avatars.ProfileContactPhoto
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.mentions.MentionsManager
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator
 
 class ProfilePictureView : RelativeLayout {
     lateinit var glide: GlideRequests
@@ -111,7 +111,7 @@ class ProfilePictureView : RelativeLayout {
             val avatar = (signalProfilePicture as? ProfileContactPhoto)?.avatarObject
             if (signalProfilePicture != null && avatar != "0" && avatar != "") {
                 glide.clear(imageView)
-                glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.AUTOMATIC).circleCrop().into(imageView)
+                glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.NONE).circleCrop().into(imageView)
                 profilePicturesCache[publicKey] = recipient.profileAvatar
             } else {
                 val sizeInPX = resources.getDimensionPixelSize(sizeResId)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index b5144d4da3..ad1864d055 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -94,7 +94,7 @@ class VisibleMessageView : LinearLayout {
             profilePictureContainer.visibility = if (isEndOfMessageCluster) View.VISIBLE else View.INVISIBLE
             profilePictureView.publicKey = senderSessionID
             profilePictureView.glide = glide
-            profilePictureView.update()
+            profilePictureView.update(message.individualRecipient, threadID)
             profilePictureView.setOnClickListener { showUserDetails(message.recipient.address.toString()) }
             if (thread.isOpenGroupRecipient) {
                 val openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID) ?: return
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
index fec96b5de8..f6010bb53d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt
@@ -5,13 +5,13 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
 import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact
@@ -34,7 +34,7 @@ class UserDetailsBottomSheet : BottomSheetDialogFragment() {
         profilePictureView.publicKey = publicKey
         profilePictureView.glide = GlideApp.with(this)
         profilePictureView.isLarge = true
-        profilePictureView.update()
+        profilePictureView.update(recipient, -1)
         nameTextViewContainer.visibility = View.VISIBLE
         nameTextViewContainer.setOnClickListener {
             nameTextViewContainer.visibility = View.INVISIBLE
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 1ab8459684..65a72b4600 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -247,7 +247,6 @@
     <string-array name="notify_types">
         <item>@string/notify_type_all</item>
         <item>@string/notify_type_mentions</item>
-        <item>@string/notify_type_none</item>
     </string-array>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d082a46d89..9fa0283acc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -893,5 +893,4 @@
     <string name="dialog_send_seed_send_button_title">Send</string>
     <string name="notify_type_all">All</string>
     <string name="notify_type_mentions">Mentions</string>
-    <string name="notify_type_none">None</string>
 </resources>