From da360fa89c81bdd64deb102027c98a22ae2b47ae Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 25 Nov 2017 20:39:23 +0100
Subject: make unencrypted chat warning configurable via settings

---
 src/main/res/values/defaults.xml | 2 ++
 src/main/res/values/strings.xml  | 2 ++
 src/main/res/xml/preferences.xml | 5 +++++
 3 files changed, 9 insertions(+)

(limited to 'src/main/res')

diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 0f62c59c2..15a25054a 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -101,4 +101,6 @@
     <bool name="plain_text_logs">false</bool>
     <bool name="validate_hostname">false</bool>
     <bool name="show_foreground_service">true</bool>
+    <bool name="warn_unencrypted_chat">true</bool>
 </resources>
+
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0d0695cf8..e8f72f3ca 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -742,4 +742,6 @@
     <string name="pref_return_to_previous">Quick Sharing</string>
     <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string>
     <string name="conversation_unencrypted_hint">This chat is unencrypted, for security reasons you should activate message encryption by using the lock icon. The preferable encryption is OMEMO.</string>
+    <string name="pref_warn_unencrypted_chat">Warn if chat is unencrypted</string>
+    <string name="pref_warn_unencrypted_chat_summary">If message encryption is available, you should use it. If you don\'t use message encryption, show a warning message inside the chat.</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 0c7552323..70ce4e76c 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -220,6 +220,11 @@
             android:key="last_activity"
             android:title="@string/pref_broadcast_last_activity"
             android:summary="@string/pref_broadcast_last_activity_summary" />
+        <CheckBoxPreference
+            android:defaultValue="@bool/warn_unencrypted_chat"
+            android:key="warn_unencrypted_chat"
+            android:title="@string/pref_warn_unencrypted_chat"
+            android:summary="@string/pref_warn_unencrypted_chat_summary"/>
         <CheckBoxPreference
             android:defaultValue="@bool/send_crashreport"
             android:key="crashreport"
-- 
cgit v1.2.3