aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-13 22:34:52 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-13 22:49:42 +0200
commitdf45a1153db622511cab205395c2dc7fd33a25f5 (patch)
tree0292b864ee1f2244ea71771c482e18c3efa8e107 /src/main/res/xml/preferences.xml
parent0f7f4bf5ed4bc8d07c333daf2c5c519dd0c7fdc9 (diff)
introduced tri state omemo setting (off by default, on by default, always)
Diffstat (limited to 'src/main/res/xml/preferences.xml')
-rw-r--r--src/main/res/xml/preferences.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 68a25d3b0..22d015ab8 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -275,6 +275,13 @@
android:key="warn_unencrypted_chat"
android:title="@string/pref_warn_unencrypted_chat"
android:summary="@string/pref_warn_unencrypted_chat_summary"/>
+ <ListPreference
+ android:defaultValue="@string/omemo_setting_default"
+ android:entries="@array/omemo_setting_entries"
+ android:entryValues="@array/omemo_setting_entry_values"
+ android:key="omemo"
+ android:summary="@string/pref_omemo_setting_summary_default_on"
+ android:title="@string/pref_omemo_setting" />
<CheckBoxPreference
android:defaultValue="@bool/send_crashreport"
android:key="crashreport"