diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-04-13 22:34:52 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-04-13 22:49:42 +0200 |
| commit | df45a1153db622511cab205395c2dc7fd33a25f5 (patch) | |
| tree | 0292b864ee1f2244ea71771c482e18c3efa8e107 /src/main/res/values | |
| parent | 0f7f4bf5ed4bc8d07c333daf2c5c519dd0c7fdc9 (diff) | |
introduced tri state omemo setting (off by default, on by default, always)
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 6 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 062f29b48..3ded5490e 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -82,4 +82,16 @@ <item>31622400</item> </integer-array> + <string-array name="omemo_setting_entry_values"> + <item>always</item> + <item>default_on</item> + <item>default_off</item> + </string-array> + + <string-array name="omemo_setting_entries"> + <item>@string/always</item> + <item>@string/default_on</item> + <item>@string/default_off</item> + </string-array> + </resources> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 425e397c9..201b9aedc 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -102,5 +102,6 @@ <bool name="enable_multi_accounts">false</bool> <bool name="show_qr_code_scan">true</bool> <bool name="scroll_to_bottom">true</bool> + <string name="omemo_setting_default">default_off</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index db7d54663..b78ea9b49 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -772,4 +772,10 @@ <string name="disable_encryption_message">Are you sure you want to disable OMEMO encryption for this conversation?\nThis will allow your server administrator to read your messages, but it might be the only way to communicate with people using outdated clients.</string> <string name="disable_now">Disable now</string> <string name="draft">Draft:</string> + <string name="pref_omemo_setting">OMEMO Encryption</string> + <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="default_on">On by default</string> + <string name="default_off">Off by default</string> </resources> |