From df45a1153db622511cab205395c2dc7fd33a25f5 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 13 Apr 2018 22:34:52 +0200
Subject: introduced tri state omemo setting (off by default, on by default,
 always)

---
 src/main/res/xml/preferences.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/res/xml/preferences.xml')

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"
-- 
cgit v1.2.3