aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-11-23 10:42:27 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-11-23 10:42:27 +0100
commit839ef8e14b576e546a13942d72139248873f7fac (patch)
tree021c0d78328b1e638d78c3507fc75abf5b229728 /src/main/res
parent4720ac94d39af262fdcc249a88b118443f7cac68 (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 b67aa23f..a62a4210 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -710,4 +710,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="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>
+ <string name="blindly_trusted_omemo_keys">Blindly trusted OMEMO keys</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index cee43491..f6c3a54b 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -165,6 +165,11 @@
android:title="@string/pref_expert_options">
<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"