From 66bd8f26b51128f29099a0ef4ac3c57eb3a0a72e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 1 Dec 2020 11:03:10 +0100
Subject: [PATCH] Fixed emoji display in contacts' name

---
 app/build.gradle                                  |  3 +++
 .../main/contact/adapters/ContactsListAdapter.kt  |  3 ++-
 .../main/java/org/linphone/core/CoreContext.kt    |  4 ++++
 app/src/main/java/org/linphone/utils/AppUtils.kt  | 15 ++++++++++++---
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 15691c393..731c1d82b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -178,6 +178,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'com.google.android:flexbox:2.0.0'
 
+    implementation 'androidx.emoji:emoji:1.1.0'
+    implementation 'androidx.emoji:emoji-bundled:1.1.0'
+
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
diff --git a/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
index b13797b76..8654da23c 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
@@ -34,6 +34,7 @@ import org.linphone.activities.main.viewmodels.ListTopBarViewModel
 import org.linphone.contact.Contact
 import org.linphone.databinding.ContactListCellBinding
 import org.linphone.databinding.GenericListHeaderBinding
+import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
 import org.linphone.utils.HeaderAdapter
 import org.linphone.utils.SelectionListAdapter
@@ -109,7 +110,7 @@ class ContactsListAdapter(
 
     override fun getHeaderViewForPosition(context: Context, position: Int): View {
         val contact = getItem(position)
-        val firstLetter = contact.fullName?.first().toString()
+        val firstLetter = AppUtils.getInitials(contact.fullName ?: "", 1)
         val binding: GenericListHeaderBinding = DataBindingUtil.inflate(
             LayoutInflater.from(context),
             R.layout.generic_list_header, null, false
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 24b4b60ff..0fa07f29f 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -29,6 +29,8 @@ import android.os.Vibrator
 import android.telephony.PhoneStateListener
 import android.telephony.TelephonyManager
 import android.view.*
+import androidx.emoji.bundled.BundledEmojiCompatConfig
+import androidx.emoji.text.EmojiCompat
 import androidx.lifecycle.MutableLiveData
 import java.io.File
 import kotlin.math.abs
@@ -233,6 +235,8 @@ class CoreContext(val context: Context, coreConfig: Config) {
         val telephonyManager = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
         Log.i("[Context] Registering phone state listener")
         telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE)
+
+        EmojiCompat.init(BundledEmojiCompatConfig(context))
     }
 
     fun stop() {
diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt
index 07afa02c7..8cd70e1aa 100644
--- a/app/src/main/java/org/linphone/utils/AppUtils.kt
+++ b/app/src/main/java/org/linphone/utils/AppUtils.kt
@@ -24,6 +24,7 @@ import android.content.*
 import android.text.Spanned
 import android.util.TypedValue
 import androidx.core.text.HtmlCompat
+import androidx.emoji.text.EmojiCompat
 import java.util.*
 import java.util.regex.Pattern
 import org.linphone.LinphoneApplication.Companion.coreContext
@@ -93,15 +94,23 @@ class AppUtils {
             return HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY)
         }
 
-        fun getInitials(displayName: String): String {
+        fun getInitials(displayName: String, limit: Int = 2): String {
             if (displayName.isEmpty()) return ""
 
+            val emoji = EmojiCompat.get()
             val split = displayName.toUpperCase(Locale.getDefault()).split(" ")
             var initials = ""
+            var characters = 0
+
             for (i in split.indices) {
                 if (split[i].isNotEmpty()) {
-                    initials += split[i][0]
-                    if (initials.length >= 2) break
+                    if (emoji.hasEmojiGlyph(split[i])) {
+                        initials += emoji.process(split[i])
+                    } else {
+                        initials += split[i][0]
+                    }
+                    characters += 1
+                    if (characters >= limit) break
                 }
             }
             return initials