session-foundation · ThomasSession · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 24, 2025
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -358,6 +358,8 @@ dependencies {
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.interpolator)
+    implementation(libs.androidx.emoji2)
+    implementation(libs.androidx.emoji2.picker)
 
     // Add firebase dependencies to specific variants
     for (variant in firebaseEnabledVariants) {

diff --git a/app/src/main/assets/emoji/Activity.png b/app/src/main/assets/emoji/Activity.png
diff --git a/app/src/main/assets/emoji/Activity.webp b/app/src/main/assets/emoji/Activity.webp
diff --git a/app/src/main/assets/emoji/Flags.png b/app/src/main/assets/emoji/Flags.png
diff --git a/app/src/main/assets/emoji/Flags_0.webp b/app/src/main/assets/emoji/Flags_0.webp
diff --git a/app/src/main/assets/emoji/Flags_1.webp b/app/src/main/assets/emoji/Flags_1.webp
diff --git a/app/src/main/assets/emoji/Foods.png b/app/src/main/assets/emoji/Foods.png
diff --git a/app/src/main/assets/emoji/Foods.webp b/app/src/main/assets/emoji/Foods.webp
diff --git a/app/src/main/assets/emoji/Nature.png b/app/src/main/assets/emoji/Nature.png
diff --git a/app/src/main/assets/emoji/Nature.webp b/app/src/main/assets/emoji/Nature.webp
diff --git a/app/src/main/assets/emoji/Objects.png b/app/src/main/assets/emoji/Objects.png
diff --git a/app/src/main/assets/emoji/Objects.webp b/app/src/main/assets/emoji/Objects.webp
diff --git a/app/src/main/assets/emoji/People_0.png b/app/src/main/assets/emoji/People_0.png
diff --git a/app/src/main/assets/emoji/People_0.webp b/app/src/main/assets/emoji/People_0.webp
diff --git a/app/src/main/assets/emoji/People_1.png b/app/src/main/assets/emoji/People_1.png
diff --git a/app/src/main/assets/emoji/People_1.webp b/app/src/main/assets/emoji/People_1.webp
diff --git a/app/src/main/assets/emoji/People_2.png b/app/src/main/assets/emoji/People_2.png
diff --git a/app/src/main/assets/emoji/People_2.webp b/app/src/main/assets/emoji/People_2.webp
diff --git a/app/src/main/assets/emoji/People_3.png b/app/src/main/assets/emoji/People_3.png
diff --git a/app/src/main/assets/emoji/People_3.webp b/app/src/main/assets/emoji/People_3.webp
diff --git a/app/src/main/assets/emoji/People_4.webp b/app/src/main/assets/emoji/People_4.webp
diff --git a/app/src/main/assets/emoji/People_5.webp b/app/src/main/assets/emoji/People_5.webp
diff --git a/app/src/main/assets/emoji/People_6.webp b/app/src/main/assets/emoji/People_6.webp
diff --git a/app/src/main/assets/emoji/People_7.webp b/app/src/main/assets/emoji/People_7.webp
diff --git a/app/src/main/assets/emoji/People_8.webp b/app/src/main/assets/emoji/People_8.webp
diff --git a/app/src/main/assets/emoji/People_9.webp b/app/src/main/assets/emoji/People_9.webp
diff --git a/app/src/main/assets/emoji/Places.png b/app/src/main/assets/emoji/Places.png
diff --git a/app/src/main/assets/emoji/Places.webp b/app/src/main/assets/emoji/Places.webp
diff --git a/app/src/main/assets/emoji/Symbols.png b/app/src/main/assets/emoji/Symbols.png
diff --git a/app/src/main/assets/emoji/Symbols.webp b/app/src/main/assets/emoji/Symbols.webp
diff --git a/app/src/main/assets/emoji/emoji_data.json b/app/src/main/assets/emoji/emoji_data.json
diff --git a/app/src/main/assets/emoji/emoji_search_index.json b/app/src/main/assets/emoji/emoji_search_index.json
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
@@ -54,7 +54,6 @@ import org.thoughtcrime.securesms.debugmenu.DebugActivity
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.dependencies.DatabaseModule.init
 import org.thoughtcrime.securesms.dependencies.OnAppStartupComponents
-import org.thoughtcrime.securesms.emoji.EmojiSource.Companion.refresh
 import org.thoughtcrime.securesms.glide.RemoteFileLoader
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.logging.AndroidLogger
@@ -145,7 +144,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver, Configuratio
 
         initializeWebRtc()
         initializeBlobProvider()
-        refresh()
 
         val networkConstraint = NetworkConstraint.Factory(this).create()
         isConnectedToNetwork = { networkConstraint.isMet }

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.kt
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEventListener.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEventListener.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiItemDecoration.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiItemDecoration.kt