From 8a091156230f7d8c10bca4a988237ad601973cf3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 12 Jan 2023 11:35:59 +0100
Subject: [PATCH] Replaced old emoji library by emoji2

---
 app/build.gradle                                   | 4 +---
 app/src/main/java/org/linphone/core/CoreContext.kt | 3 ---
 app/src/main/java/org/linphone/utils/AppUtils.kt   | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 34b7bce2c..d42b1d2df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,6 +196,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.emoji2:emoji2:1.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     implementation 'androidx.media:media:1.6.0'
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03"
@@ -215,9 +216,6 @@ dependencies {
     // https://github.com/google/flexbox-layout/blob/main/LICENSE Apache v2.0
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
-    implementation 'androidx.emoji:emoji:1.1.0'
-    implementation 'androidx.emoji:emoji-bundled:1.1.0'
-
     // https://github.com/coil-kt/coil/blob/main/LICENSE.txt Apache v2.0
     def coil_version = "2.2.2"
     implementation("io.coil-kt:coil:$coil_version")
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 2729ecb14..6c10f52ca 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -32,8 +32,6 @@ import android.util.Base64
 import android.util.Pair
 import android.view.*
 import android.webkit.MimeTypeMap
-import androidx.emoji.bundled.BundledEmojiCompatConfig
-import androidx.emoji.text.EmojiCompat
 import androidx.lifecycle.*
 import androidx.loader.app.LoaderManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -341,7 +339,6 @@ class CoreContext(
 
         notificationsManager.onCoreReady()
 
-        EmojiCompat.init(BundledEmojiCompatConfig(context))
         collator.strength = Collator.NO_DECOMPOSITION
 
         if (corePreferences.vfsEnabled) {
diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt
index f3b83fa42..8ba84545c 100644
--- a/app/src/main/java/org/linphone/utils/AppUtils.kt
+++ b/app/src/main/java/org/linphone/utils/AppUtils.kt
@@ -28,7 +28,7 @@ import android.os.Bundle
 import android.text.format.Formatter.formatShortFileSize
 import android.util.TypedValue
 import androidx.core.content.res.ResourcesCompat
-import androidx.emoji.text.EmojiCompat
+import androidx.emoji2.text.EmojiCompat
 import androidx.media.AudioAttributesCompat
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat