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/values/arrays.xml   | 12 ++++++++++++
 src/main/res/values/defaults.xml |  1 +
 src/main/res/values/strings.xml  |  6 ++++++
 src/main/res/xml/preferences.xml |  7 +++++++
 4 files changed, 26 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 062f29b48..3ded5490e 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -82,4 +82,16 @@
         <item>31622400</item>
     </integer-array>
 
+    <string-array name="omemo_setting_entry_values">
+        <item>always</item>
+        <item>default_on</item>
+        <item>default_off</item>
+    </string-array>
+
+    <string-array name="omemo_setting_entries">
+        <item>@string/always</item>
+        <item>@string/default_on</item>
+        <item>@string/default_off</item>
+    </string-array>
+
 </resources>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 425e397c9..201b9aedc 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -102,5 +102,6 @@
     <bool name="enable_multi_accounts">false</bool>
     <bool name="show_qr_code_scan">true</bool>
     <bool name="scroll_to_bottom">true</bool>
+    <string name="omemo_setting_default">default_off</string>
 </resources>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index db7d54663..b78ea9b49 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -772,4 +772,10 @@
     <string name="disable_encryption_message">Are you sure you want to disable OMEMO encryption for this conversation?\nThis will allow your server administrator to read your messages, but it might be the only way to communicate with people using outdated clients.</string>
     <string name="disable_now">Disable now</string>
     <string name="draft">Draft:</string>
+    <string name="pref_omemo_setting">OMEMO Encryption</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO will always be used for one-on-one and private group chats.</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO will be used by default for new conversations.</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO will have to be turned on explicitly for new conversations.</string>
+    <string name="default_on">On by default</string>
+    <string name="default_off">Off by default</string>
 </resources>
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