From 58953e6193b25ca9fd7624954ef7cb986e43b3da Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 8 Sep 2014 13:37:22 +0200
Subject: settings to force encryption and setting for not saving messages to
 disk. fixed #353

---
 res/values/strings.xml  |  5 +++++
 res/xml/preferences.xml | 13 +++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1153abbe..3aa30e40 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -245,5 +245,10 @@
     <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
     <string name="ignore">Ignore</string>
     <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
+    <string name="pref_encryption_settings">Encryption settings</string>
+    <string name="pref_force_encryption">Force end-to-end encryption</string>
+    <string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string>
+    <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
+    <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index cc2b952f..37331a0e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -60,6 +60,19 @@
             android:summary="@string/pref_notification_grace_period_summary"
             android:defaultValue="true"/>
     </PreferenceCategory>
+    <PreferenceCategory 
+        android:title="@string/pref_encryption_settings">
+        <CheckBoxPreference 
+            android:key="force_encryption"
+            android:title="@string/pref_force_encryption"
+            android:summary="@string/pref_force_encryption_summary"
+            android:defaultValue="false"/>
+        <CheckBoxPreference 
+            android:key="dont_save_encrypted"
+            android:title="@string/pref_dont_save_encrypted"
+            android:summary="@string/pref_dont_save_encrypted_summary"
+            android:defaultValue="false"/>
+    </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/pref_advanced_options">
         <CheckBoxPreference 
-- 
cgit v1.2.3