Add viewer count and list to 'All Signal Connections'.

app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchConfiguration.kt

@@ -52,7 +52,8 @@ class ContactSearchConfiguration private constructor(
       val includeSelf: Boolean,
       val transportType: TransportType,
       override val includeHeader: Boolean,
-      override val expandConfig: ExpandConfig? = null
+      override val expandConfig: ExpandConfig? = null,
+      val includeLetterHeaders: Boolean = false
     ) : Section(SectionKey.INDIVIDUALS)
 
     /**

app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchData.kt

@@ -23,7 +23,11 @@ sealed class ContactSearchData(val contactSearchKey: ContactSearchKey) {
   /**
    * A row displaying a known recipient.
    */
-  data class KnownRecipient(val recipient: Recipient, val shortSummary: Boolean = false) : ContactSearchData(ContactSearchKey.RecipientSearchKey.KnownRecipient(recipient.id))
+  data class KnownRecipient(
+    val recipient: Recipient,
+    val shortSummary: Boolean = false,
+    val headerLetter: String? = null
+  ) : ContactSearchData(ContactSearchKey.RecipientSearchKey.KnownRecipient(recipient.id))
 
   /**
    * A row containing a title for a given section

app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchItems.kt

@@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.components.FromTextView
 import org.thoughtcrime.securesms.components.menu.ActionItem
 import org.thoughtcrime.securesms.components.menu.SignalContextMenu
+import org.thoughtcrime.securesms.contacts.LetterHeaderDecoration
 import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -226,7 +227,10 @@ object ContactSearchItems {
     }
   }
 
-  private class KnownRecipientViewHolder(itemView: View, displayCheckBox: Boolean, onClick: RecipientClickListener) : BaseRecipientViewHolder<RecipientModel, ContactSearchData.KnownRecipient>(itemView, displayCheckBox, onClick) {
+  private class KnownRecipientViewHolder(itemView: View, displayCheckBox: Boolean, onClick: RecipientClickListener) : BaseRecipientViewHolder<RecipientModel, ContactSearchData.KnownRecipient>(itemView, displayCheckBox, onClick), LetterHeaderDecoration.LetterHeaderItem {
+
+    private var headerLetter: String? = null
+
     override fun isSelected(model: RecipientModel): Boolean = model.isSelected
     override fun getData(model: RecipientModel): ContactSearchData.KnownRecipient = model.knownRecipient
     override fun getRecipient(model: RecipientModel): Recipient = model.knownRecipient.recipient
@@ -235,10 +239,16 @@ object ContactSearchItems {
 
       if (model.shortSummary && recipient.isGroup) {
         val count = recipient.participantIds.size
-        number.setText(context.resources.getQuantityString(R.plurals.ContactSearchItems__group_d_members, count, count))
+        number.text = context.resources.getQuantityString(R.plurals.ContactSearchItems__group_d_members, count, count)
       } else {
         super.bindNumberField(model)
       }
+
+      headerLetter = model.knownRecipient.headerLetter
+    }
+
+    override fun getHeaderLetter(): String? {
+      return headerLetter
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSource.kt

@@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.StorySend
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
 import java.util.concurrent.TimeUnit
 
 /**
@@ -129,6 +130,13 @@ class ContactSearchPagedDataSource(
     }
   }
 
+  private fun getNonGroupHeaderLetterMap(section: ContactSearchConfiguration.Section.Individuals, query: String?): Map<RecipientId, String> {
+    return when (section.transportType) {
+      ContactSearchConfiguration.TransportType.PUSH -> contactSearchPagedDataSourceRepository.querySignalContactLetterHeaders(query, section.includeSelf)
+      else -> error("This has only been implemented for push recipients.")
+    }
+  }
+
   private fun getStoriesSearchIterator(query: String?): ContactSearchIterator<Cursor> {
     return CursorSearchIterator(contactSearchPagedDataSourceRepository.getStories(query))
   }
@@ -193,6 +201,12 @@ class ContactSearchPagedDataSource(
   }
 
   private fun getNonGroupContactsData(section: ContactSearchConfiguration.Section.Individuals, query: String?, startIndex: Int, endIndex: Int): List<ContactSearchData> {
+    val headerMap: Map<RecipientId, String> = if (section.includeLetterHeaders) {
+      getNonGroupHeaderLetterMap(section, query)
+    } else {
+      emptyMap()
+    }
+
     return getNonGroupSearchIterator(section, query).use { records ->
       readContactData(
         records = records,
@@ -201,7 +215,8 @@ class ContactSearchPagedDataSource(
         startIndex = startIndex,
         endIndex = endIndex,
         recordMapper = {
-          ContactSearchData.KnownRecipient(contactSearchPagedDataSourceRepository.getRecipientFromRecipientCursor(it))
+          val recipient = contactSearchPagedDataSourceRepository.getRecipientFromRecipientCursor(it)
+          ContactSearchData.KnownRecipient(recipient, headerLetter = headerMap[recipient.id])
         }
       )
     }

app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository.kt

@@ -36,6 +36,10 @@ open class ContactSearchPagedDataSourceRepository(
     return contactRepository.querySignalContacts(query ?: "", includeSelf)
   }
 
+  open fun querySignalContactLetterHeaders(query: String?, includeSelf: Boolean): Map<RecipientId, String> {
+    return SignalDatabase.recipients.querySignalContactLetterHeaders(query ?: "", includeSelf)
+  }
+
   open fun queryNonSignalContacts(query: String?): Cursor? {
     return contactRepository.queryNonSignalContacts(query ?: "")
   }