Fix #3620 - Fix frequently used emojis, stop relying on Apple's keybo…

…ard values and store everything app side instead.
element-hq · Dec 16, 2024 · e04c874 · e04c874
1 parent f9be39e
commit e04c874
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift
@@ -28,6 +28,8 @@ final class AppSettings {
         case hasRunNotificationPermissionsOnboarding
         case hasRunIdentityConfirmationOnboarding
 
+        case frequentlyUsedSystemEmojis
+
         case enableNotifications
         case enableInAppNotifications
         case pusherProfileTag
@@ -40,7 +42,6 @@ final class AppSettings {
         case hideTimelineMedia
 
         case elementCallBaseURLOverride
-        case elementCallEncryptionEnabled
 
         // Feature flags
         case slidingSyncDiscovery
@@ -231,6 +232,9 @@ final class AppSettings {
     @UserPreference(key: UserDefaultsKeys.hasRunIdentityConfirmationOnboarding, defaultValue: false, storageType: .userDefaults(store))
     var hasRunIdentityConfirmationOnboarding
 
+    @UserPreference(key: UserDefaultsKeys.frequentlyUsedSystemEmojis, defaultValue: [String](), storageType: .userDefaults(store))
+    var frequentlyUsedSystemEmojis
+
     // MARK: - Home Screen
 
     @UserPreference(key: UserDefaultsKeys.hideUnreadMessagesBadge, defaultValue: false, storageType: .userDefaults(store))

diff --git a/ElementX/Sources/Services/Emojis/EmojiProvider.swift b/ElementX/Sources/Services/Emojis/EmojiProvider.swift
@@ -61,31 +61,18 @@ class EmojiProvider: EmojiProviderProtocol {
             return []
         }
 
-        guard let preferences = UserDefaults(suiteName: "com.apple.EmojiPreferences"),
-              let defaults = preferences.dictionary(forKey: "EMFDefaultsKey"),
-              let recents = defaults["EMFRecentsKey"] as? [String]
-        else {
-            return []
-        }
-
-        return recents
+        return appSettings.frequentlyUsedSystemEmojis
     }
 
     func markEmojiAsFrequentlyUsed(_ emoji: String) {
         guard !ProcessInfo.processInfo.isiOSAppOnMac else {
             return
         }
 
-        guard let preferences = UserDefaults(suiteName: "com.apple.EmojiPreferences"),
-              let defaults = preferences.dictionary(forKey: "EMFDefaultsKey"),
-              let recents = defaults["EMFRecentsKey"] as? [String] else {
-            return
-        }
-
-        var uniqueOrderedRecents = OrderedSet(recents)
+        var uniqueOrderedRecents = OrderedSet(appSettings.frequentlyUsedSystemEmojis)
         uniqueOrderedRecents.insert(emoji, at: 0)
 
-        preferences.setValue(["EMFRecentsKey": Array(uniqueOrderedRecents)], forKey: "EMFDefaultsKey")
+        appSettings.frequentlyUsedSystemEmojis = Array(uniqueOrderedRecents)
     }
 
     // MARK: - Private