diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/arrays.xml | 14 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 12 |
3 files changed, 28 insertions, 5 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 0695d1cd..3ce79dee 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -103,4 +103,18 @@ <item>610</item> <item>2584</item> </string-array> + <string-array name="automatic_message_deletion_values"> + <item>0</item> + <item>86400</item> + <item>604800</item> + <item>2592000</item> + <item>15811200</item> + </string-array> + <string-array name="automatic_message_deletion"> + <item>@string/never</item> + <item>@string/timeout_24_hours</item> + <item>@string/timeout_7_days</item> + <item>@string/timeout_30_days</item> + <item>@string/timeout_6_months</item> + </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9ad0d63d..b56ec72c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -724,5 +724,12 @@ <string name="hide_inactive_devices">Hide inactive devices</string> <string name="distrust_omemo_key">Distrust device</string> <string name="distrust_omemo_key_text">Are you sure you want to remove the verification for this device?\nThis device and messages coming from that device will be marked as untrusted.</string> + <string name="timeout_24_hours">24 hours</string> + <string name="timeout_7_days">7 days</string> + <string name="timeout_30_days">30 days</string> + <string name="timeout_6_months">6 months</string> + <string name="pref_automatically_delete_messages">Automatic message deletion</string> + <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string> <string name="encrypting_message">Encrypting message</string> + <string name="not_fetching_history_retention_period">Overstepping local retention period.</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 751f3bec..31014d85 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -170,11 +170,13 @@ 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" - android:title="@string/pref_dont_save_encrypted"/> + <ListPreference + android:key="automatic_message_deletion" + android:title="@string/pref_automatically_delete_messages" + android:summary="@string/pref_automatically_delete_messages_description" + android:defaultValue="0" + android:entries="@array/automatic_message_deletion" + android:entryValues="@array/automatic_message_deletion_values" /> <CheckBoxPreference android:defaultValue="false" android:key="dont_trust_system_cas" |