1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 852699e6..590d6259 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -123,6 +124,12 @@ public class SettingsActivity extends XmppActivity implements
                 return true;
             }
         });
+        // Avoid appearence of setting to enable or disable omemo in screen
+        Preference omemoEnabledPreference = this.mSettingsFragment.findPreference("omemo_enabled");
+        PreferenceCategory otherExpertSettingsGroup = (PreferenceCategory) this.mSettingsFragment.findPreference("other_expert_settings");
+        if (null != omemoEnabledPreference && null != otherExpertSettingsGroup) {
+            otherExpertSettingsGroup.removePreference(omemoEnabledPreference);
+        }
 	}
 
 	@Override