aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-24 21:42:35 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-24 21:42:35 +0100
commitfefae63f1dceef88c42a2c80ce7265419095316f (patch)
tree304098147b44995538ff9ca6cb7d46c6825254ed /src/main/res
parent02ff5375371d5178c6e0bb099d2a962488c1ef4a (diff)
introduced blind trust before verification mode
read more about the concept on https://gultsch.de/trust.html
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml3
-rw-r--r--src/main/res/xml/preferences.xml5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1dbb0454c..efd8bcc26 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -718,4 +718,7 @@
<string name="share_as_barcode">Share as Barcode</string>
<string name="share_as_uri">Share as XMPP URI</string>
<string name="share_as_http">Share as HTTP link</string>
+ <string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string>
+ <string name="pref_blind_trust_before_verification">Blind Trust Before Verification</string>
+ <string name="pref_blind_trust_before_verification_summary">Automatically trust all new devices from contacts that haven’t been verified before.</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 3159fd61e..959201f5c 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -228,6 +228,11 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_security_settings">
<CheckBoxPreference
+ android:defaultValue="true"
+ android:key="btbv"
+ android:title="@string/pref_blind_trust_before_verification"
+ android:summary="@string/pref_blind_trust_before_verification_summary"/>
+ <CheckBoxPreference
android:defaultValue="false"
android:key="dont_save_encrypted"
android:summary="@string/pref_dont_save_encrypted_summary"