From dd9b134dab6d9dde6fd0054424c0e8a995045d35 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Wed, 15 Apr 2020 13:06:10 +1000
Subject: [PATCH] Updated UserView

---
 .../activities/ContactSelectionListAdapter.kt |  2 +-
 .../activities/CreateClosedGroupAdapter.kt    |  4 ++-
 .../securesms/loki/redesign/views/UserView.kt | 29 +++++++++++++++----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/ContactSelectionListAdapter.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/ContactSelectionListAdapter.kt
index 88564c701b..821ae6a554 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/ContactSelectionListAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/ContactSelectionListAdapter.kt
@@ -53,7 +53,7 @@ class ContactSelectionListAdapter(private val context: Context, private val isMu
       item as ContactSelectionListLoaderItem.Contact
       viewHolder.view.setOnClickListener { contactClickListener?.onContactClick(item.recipient) }
       val isSelected = selectedContacts.contains(item.recipient)
-      viewHolder.view.bind(item.recipient.address.serialize(), isSelected, glide)
+      viewHolder.view.bind(item.recipient, isSelected, glide)
     } else if (viewHolder is DividerViewHolder) {
       item as ContactSelectionListLoaderItem.Header
       viewHolder.view.label.text = item.name
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupAdapter.kt
index bd8c6eff02..22f9c76742 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupAdapter.kt
@@ -3,8 +3,10 @@ package org.thoughtcrime.securesms.loki.redesign.activities
 import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
+import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.loki.redesign.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
 
 class CreateClosedGroupAdapter(private val context: Context) : RecyclerView.Adapter<CreateClosedGroupAdapter.ViewHolder>() {
     lateinit var glide: GlideRequests
@@ -28,7 +30,7 @@ class CreateClosedGroupAdapter(private val context: Context) : RecyclerView.Adap
         val member = members[position]
         viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
         val isSelected = selectedMembers.contains(member)
-        viewHolder.view.bind(member, isSelected, glide)
+        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide)
     }
 
     fun onMemberClick(member: String) {
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/UserView.kt
index 2b6e6536f7..e8f86e4ba5 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/UserView.kt
@@ -7,9 +7,10 @@ import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_conversation.view.profilePictureView
 import kotlinx.android.synthetic.main.view_user.view.*
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.whispersystems.signalservice.loki.api.LokiAPI
 
 class UserView : LinearLayout {
     var user: String? = null
@@ -39,13 +40,29 @@ class UserView : LinearLayout {
     // endregion
 
     // region Updating
-    fun bind(user: String, isSelected: Boolean, glide: GlideRequests) {
-        profilePictureView.hexEncodedPublicKey = user
-        profilePictureView.additionalHexEncodedPublicKey = null
-        profilePictureView.isRSSFeed = false
+    fun bind(user: Recipient, isSelected: Boolean, glide: GlideRequests) {
+        val address = user.address.serialize()
+        if (user.isGroupRecipient) {
+            if (user.address.isPublicChat || user.address.isRSSFeed) {
+                profilePictureView.hexEncodedPublicKey = ""
+                profilePictureView.additionalHexEncodedPublicKey = null
+                profilePictureView.isRSSFeed = true
+            } else {
+                val threadId = GroupManager.getThreadIdFromGroupId(address, context)
+                val users = LokiAPI.userHexEncodedPublicKeyCache[threadId]?.toList() ?: listOf()
+                val randomUsers = users.sorted() // Sort to provide a level of stability
+                profilePictureView.hexEncodedPublicKey = randomUsers.getOrNull(0) ?: ""
+                profilePictureView.additionalHexEncodedPublicKey = randomUsers.getOrNull(1) ?: ""
+                profilePictureView.isRSSFeed = false
+            }
+        } else {
+            profilePictureView.hexEncodedPublicKey = address
+            profilePictureView.additionalHexEncodedPublicKey = null
+            profilePictureView.isRSSFeed = false
+        }
         profilePictureView.glide = glide
         profilePictureView.update()
-        nameTextView.text = Recipient.from(context, Address.fromSerialized(user), false).name ?: "Unknown Contact"
+        nameTextView.text = user.name ?: "Unknown Contact"
         tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
     }
     // endregion