Fixes FS#147: Disable OMEMO

5 files changed, 16 insertions, 3 deletions

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index cf49b3ac..58e168f3 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -504,7 +504,8 @@
                     android:id="@+id/axolotl_fingerprint_box"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="32dp">
+                    android:layout_marginTop="32dp"
+                    android:visibility="gone">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index ab42a206..445c4114 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -7,7 +7,8 @@
             android:title="@string/encryption_choice_unencrypted"/>
         <item
             android:id="@+id/encryption_choice_axolotl"
-            android:title="@string/encryption_choice_omemo"/>
+            android:title="@string/encryption_choice_omemo"
+            android:visible="@bool/omemo_enabled"/>
         <item
             android:id="@+id/encryption_choice_otr"
             android:title="@string/encryption_choice_otr"/>
diff --git a/src/main/res/values/encryption_settings.xml b/src/main/res/values/encryption_settings.xml
new file mode 100644
index 00000000..33db8387
--- /dev/null
+++ b/src/main/res/values/encryption_settings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="omemo_enabled">false</bool>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 320bb6c2..f9850bc4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -654,4 +654,6 @@
 	<string name="no_accounts">(No activated accounts)</string>
 	<string name="this_field_is_required">This field is required</string>
 	<string name="retry_decryption">Retry decryption</string>
+	<string name="pref_omemo_enabled_summary">Enable OMEMO?</string>
+	<string name="pref_omemo_enabled_title">Enable OMEMO</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 42e2fdd8..622e772c 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -227,7 +227,7 @@
                     android:summary="@string/pref_xa_on_silent_mode_summary"
                     android:title="@string/pref_xa_on_silent_mode"/>
             </PreferenceCategory>
-            <PreferenceCategory android:title="@string/pref_expert_options_other">
+            <PreferenceCategory android:key="other_expert_settings" android:title="@string/pref_expert_options_other">
                 <CheckBoxPreference
                     android:key="autojoin"
                     android:defaultValue="true"
@@ -251,6 +251,11 @@
                 <de.thedevstack.conversationsplus.ui.preferences.LogInformationPreference
                     android:summary="@string/pref_show_logcat_summary"
                     android:title="@string/pref_show_logcat_title"/>
+                <CheckBoxPreference
+                    android:defaultValue="@bool/omemo_enabled"
+                    android:key="omemo_enabled"
+                    android:summary="@string/pref_omemo_enabled_summary"
+                    android:title="@string/pref_omemo_enabled_title"/>
             </PreferenceCategory>
         </PreferenceScreen>