1 files changed, 17 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index b46cf63b9..eaefb1fa2 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -61,7 +61,10 @@ public class SettingsActivity extends XmppActivity implements
     private SettingsFragment mSettingsFragment;
 
     Preference multiAccountPreference;
+    Preference BundledEmojiPreference;
+
     boolean isMultiAccountChecked = false;
+    boolean isBundledEmojiChecked;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -95,6 +98,11 @@ public class SettingsActivity extends XmppActivity implements
             isMultiAccountChecked = ((CheckBoxPreference) multiAccountPreference).isChecked();
         }
 
+        BundledEmojiPreference = mSettingsFragment.findPreference("use_bundled_emoji");
+        if (BundledEmojiPreference != null) {
+            isBundledEmojiChecked = ((CheckBoxPreference) BundledEmojiPreference).isChecked();
+        }
+
         if (Config.FORCE_ORBOT) {
             PreferenceCategory connectionOptions = (PreferenceCategory) mSettingsFragment.findPreference("connection_options");
             PreferenceScreen expert = (PreferenceScreen) mSettingsFragment.findPreference("expert");
@@ -219,6 +227,15 @@ public class SettingsActivity extends XmppActivity implements
             deleteOmemoPreference.setOnPreferenceClickListener(preference -> deleteOmemoIdentities());
         }
 
+        final Preference useBundledEmojis = mSettingsFragment.findPreference("use_bundled_emoji");
+        if (useBundledEmojis != null) {
+            Log.d(Config.LOGTAG, "Bundled Emoji checkbox checked: " + isBundledEmojiChecked);
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O && isBundledEmojiChecked) {
+                ((CheckBoxPreference) BundledEmojiPreference).setChecked(false);
+                useBundledEmojis.setEnabled(false);
+            }
+        }
+
         final Preference enableMultiAccountsPreference = mSettingsFragment.findPreference("enable_multi_accounts");
         if (enableMultiAccountsPreference != null) {
             Log.d(Config.LOGTAG, "Multi account checkbox checked: " + isMultiAccountChecked);