Feature/clean emojis

app/build.gradle.kts

@@ -352,6 +352,8 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.emoji2)
+    implementation(libs.androidx.emoji2.picker)
 
     // Add firebase dependencies to specific variants
     for (variant in firebaseEnabledVariants) {

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt

@@ -49,7 +49,6 @@ import org.session.libsession.messaging.groups.GroupManagerV2
 import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
 import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.notifications.TokenFetcher
-import org.session.libsession.messaging.sending_receiving.ReceivedMessageHandler
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier
 import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPollerManager
 import org.session.libsession.messaging.sending_receiving.pollers.PollerManager
@@ -65,23 +64,19 @@ import org.session.libsession.utilities.Toaster
 import org.session.libsession.utilities.UsernameUtils
 import org.session.libsession.utilities.WindowDebouncer
 import org.session.libsignal.utilities.HTTP.isConnectedToNetwork
-import org.session.libsignal.utilities.JsonUtil
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.AppContext.configureKovenant
 import org.thoughtcrime.securesms.components.TypingStatusSender
 import org.thoughtcrime.securesms.configs.ConfigUploader
-import org.thoughtcrime.securesms.database.EmojiSearchDatabase
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.database.ThreadDatabase
-import org.thoughtcrime.securesms.database.model.EmojiSearchData
 import org.thoughtcrime.securesms.debugmenu.DebugActivity
 import org.thoughtcrime.securesms.dependencies.AppComponent
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.dependencies.DatabaseModule.init
 import org.thoughtcrime.securesms.disguise.AppDisguiseManager
-import org.thoughtcrime.securesms.emoji.EmojiSource.Companion.refresh
 import org.thoughtcrime.securesms.groups.ExpiredGroupManager
 import org.thoughtcrime.securesms.groups.GroupPollerManager
 import org.thoughtcrime.securesms.groups.handler.AdminStateSync
@@ -111,11 +106,8 @@ import org.thoughtcrime.securesms.webrtc.CallMessageProcessor
 import org.thoughtcrime.securesms.webrtc.WebRtcCallBridge
 import org.webrtc.PeerConnectionFactory
 import org.webrtc.PeerConnectionFactory.InitializationOptions
-import java.io.IOException
 import java.security.Security
-import java.util.Arrays
 import java.util.Timer
-import java.util.concurrent.Executors
 import javax.inject.Inject
 import kotlin.concurrent.Volatile
 
@@ -187,7 +179,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
 
     @Inject lateinit var messageNotifierLazy: Lazy<MessageNotifier>
     @Inject lateinit var apiDB: Lazy<LokiAPIDatabase>
-    @Inject lateinit var emojiSearchDb: Lazy<EmojiSearchDatabase>
     @Inject lateinit var webRtcCallBridge: Lazy<WebRtcCallBridge>
     @Inject lateinit var legacyGroupDeprecationManager: Lazy<LegacyGroupDeprecationManager>
     @Inject lateinit var cleanupInvitationHandler: Lazy<CleanupInvitationHandler>
@@ -196,6 +187,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
     @Inject lateinit var proStatusManager: Lazy<ProStatusManager>
     @Inject lateinit var messageSendJobFactory: MessageSendJob.Factory
 
+
     @Inject
     lateinit var backgroundPollManager: Lazy<BackgroundPollManager> // Exists here only to start upon app starts
 
@@ -321,8 +313,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         initializeWebRtc()
         initializeBlobProvider()
         resubmitProfilePictureIfNeeded()
-        loadEmojiSearchIndexIfNeeded()
-        refresh()
 
         val networkConstraint = NetworkConstraint.Factory(this).create()
         isConnectedToNetwork = { networkConstraint.isMet }
@@ -383,7 +373,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         readReceiptManager.get()
         messageNotifierLazy.get()
         apiDB.get()
-        emojiSearchDb.get()
         webRtcCallBridge.get()
         pollerManager.get()
         legacyGroupDeprecationManager.get()
@@ -483,29 +472,6 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
         resubmitProfilePictureIfNeeded(this)
     }
 
-    private fun loadEmojiSearchIndexIfNeeded() {
-        Executors.newSingleThreadExecutor().execute {
-            if (emojiSearchDb.get().query("face", 1).isEmpty()) {
-                try {
-                    assets.open("emoji/emoji_search_index.json").use { inputStream ->
-                        val searchIndex = Arrays.asList(
-                            *JsonUtil.fromJson(
-                                inputStream,
-                                Array<EmojiSearchData>::class.java
-                            )
-                        )
-                        emojiSearchDb.get().setSearchIndex(searchIndex)
-                    }
-                } catch (e: IOException) {
-                    Log.e(
-                        "Loki",
-                        "Failed to load emoji search index"
-                    )
-                }
-            }
-        }
-    } // endregion
-
     companion object {
         const val PREFERENCES_NAME: String = "SecureSMS-Preferences"
 

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiImageView.java

@@ -34,7 +34,8 @@ public void setImageEmoji(CharSequence emoji) {
     if (isInEditMode()) {
       setImageResource(R.drawable.ic_emoji);
     } else {
-      Drawable emojiDrawable = EmojiProvider.getEmojiDrawable(getContext(), emoji);
+      //todo: EMOJI commented out
+      Drawable emojiDrawable = null;//EmojiProvider.getEmojiDrawable(getContext(), emoji);
       if (emojiDrawable == null) {
         // fallback
         setImageResource(R.drawable.ic_square_x);