diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/defaults.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 4d769d9de..36f881348 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -55,6 +55,7 @@ <bool name="use_internal_updater">true</bool> <bool name="show_own_accounts">true</bool> <bool name="vibrate_in_chat">true</bool> + <bool name="enable_otr">false</bool> <integer name="auto_accept_filesize_wifi">10485760</integer> <integer name="auto_accept_filesize_mobile">524288</integer> <integer name="auto_accept_filesize_roaming">0</integer> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5b515a738..b44679e52 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -993,4 +993,6 @@ <string name="pref_theme_orange">Orange</string> <string name="pref_theme_color_options_summary">Select the theme color palette</string> <string name="pref_theme_color_options">Theme color</string> + <string name="pref_enable_otr_summary">Enable OTR encryption for message encryption</string> + <string name="pref_enable_otr">Enable OTR encryption</string> </resources> 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" |