aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-02 16:54:18 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-02 16:54:18 +0100
commit5d21abac1dd2fed7a5e87f8fb23bc15ee0912322 (patch)
tree2f1e62051972c0be576794f09a67bf9036a8b915 /src/main/res/xml
parentc26f907263209325dc23b1c3e4b59b8cb6e6610e (diff)
Fixes FS#147: Disable OMEMO
Diffstat (limited to 'src/main/res/xml')
-rw-r--r--src/main/res/xml/preferences.xml7
1 files changed, 6 insertions, 1 deletions
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>