diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 7 | ||||
| -rw-r--r-- | src/main/res/values/arrays.xml | 20 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 12 |
4 files changed, 37 insertions, 5 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index f3af24fa5..b3f808120 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -681,5 +681,12 @@ <string name="distrust_omemo_key">Gerät misstrauen</string> <string name="distrust_omemo_key_text">Bist du sicher, dass du die Verifizierung dieses Gerätes misstrauen möchtest? Dieses Gerät und Nachrichten von dem Gerät werden als unverifiziert markiert.</string> <string name="transcoding_video_progress">Video wird komprimiert (%s%% fertiggestellt)</string> + <string name="encrypting_message">Nachricht wird verschlüsselt</string> + <string name="pref_automatically_delete_messages">Nachrichten automatisch löschen</string> + <string name="pref_automatically_delete_messages_description">Nachrichten von diesel Gerät nach dem eingestellten Zeitfenster automatisch löschen.</string> + <string name="timeout_24_hours">24 Studnen</string> + <string name="timeout_30_days">30 Tage</string> + <string name="timeout_6_months">6 Monate</string> + <string name="timeout_7_days">7 Tage</string> </resources> diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 821fd7068..a4b20e3ab 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -84,4 +84,24 @@ <item>@string/presence_dnd</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> + + <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> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9b40b97c3..738b2a441 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -727,4 +727,7 @@ <string name="reply">Reply</string> <string name="encrypting_message">Encrypting message</string> <string name="transcoding_video_progress">Compressing video (%s%% completed)</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="pref_automatically_delete_messages">Automatic message deletion</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 92078afc0..05d4551fb 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -225,11 +225,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:defaultValue="0" + android:entries="@array/automatic_message_deletion" + android:entryValues="@array/automatic_message_deletion_values" + android:key="automatic_message_deletion" + android:summary="@string/pref_automatically_delete_messages_description" + android:title="@string/pref_automatically_delete_messages" /> <Preference android:key="delete_omemo_identities" android:title="@string/pref_delete_omemo_identities" |