aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-12-13 21:17:01 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-12-13 21:17:01 +0100
commitb8602852b77e2b0f9f52b7bcb4fc87040e02ef48 (patch)
tree89db562a0774a92d028b8e4a68ccb1e9ac502de7 /src/main/res/xml/preferences.xml
parentdc44c346ca291e2cfad7c726566cd7a55ce473b5 (diff)
first step to remove OTR encryption
* make OTR available via expert settings and disable it as default
Diffstat (limited to 'src/main/res/xml/preferences.xml')
-rw-r--r--src/main/res/xml/preferences.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 1b37df35f..f6f018cd2 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -449,6 +449,11 @@
android:summary="@string/pref_delete_omemo_identities_summary"
android:title="@string/pref_delete_omemo_identities" />
<CheckBoxPreference
+ android:defaultValue="@bool/enable_otr"
+ android:key="enable_otr_encryption"
+ android:summary="@string/pref_enable_otr_summary"
+ android:title="@string/pref_enable_otr" />
+ <CheckBoxPreference
android:defaultValue="@bool/dont_trust_system_cas"
android:key="dont_trust_system_cas"
android:summary="@string/pref_dont_trust_system_cas_summary"