diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-02 17:18:45 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-02 17:18:45 +0100 |
| commit | 06949b76490736783520d783f0ec889e58707062 (patch) | |
| tree | 946b6a6d16ba1d03ee2e82dbba79e2a6b8c128e3 /src/main/res | |
| parent | f81d60f9a84ebe491b9343f4dfbdf0e893100cd3 (diff) | |
introduce setting to completely disable (OMEMO) encryption
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index b15e4cea2..fecbff8a4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -105,12 +105,14 @@ <item>always</item> <item>default_on</item> <item>default_off</item> + <item>always_off</item> </string-array> <string-array name="omemo_setting_entries"> <item>@string/always</item> <item>@string/default_on</item> <item>@string/default_off</item> + <item>@string/always_off</item> </string-array> <string-array name="font_size_entry_values"> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f3a5071a8..83de8be6b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -496,6 +496,7 @@ <string name="video_high">high (1080p)</string> <string name="video_original">original (uncompressed)</string> <string name="always">Always</string> + <string name="always_off">Always off</string> <string name="battery_optimizations_enabled">Battery optimizations enabled</string> <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string> <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string> @@ -734,6 +735,7 @@ <string name="pref_omemo_setting_summary_always">OMEMO will always be used for one-on-one and private group chats.</string> <string name="pref_omemo_setting_summary_default_on">OMEMO will be used by default for new conversations.</string> <string name="pref_omemo_setting_summary_default_off">OMEMO will have to be turned on explicitly for new conversations.</string> + <string name="pref_omemo_setting_summary_always_off">OMEMO will never be used.</string> <string name="default_on">On by default</string> <string name="default_off">Off by default</string> <string name="pref_theme_light">Light theme</string> |