From 40a79fbad531fd76c5e5c5977840396cf2df21b2 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 4 Dec 2024 17:46:00 +0100 Subject: [PATCH 1/6] add "After 90 days" option to disappearing messages --- .../java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java | 1 + src/main/res/values/arrays.xml | 1 + src/main/res/values/strings.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java index 12b09669d..63b5c4eb8 100644 --- a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java +++ b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java @@ -67,6 +67,7 @@ public class EphemeralMessagesDialog { case 5: burnAfter = TimeUnit.DAYS.toSeconds(1); break; case 6: burnAfter = TimeUnit.DAYS.toSeconds(7); break; case 7: burnAfter = TimeUnit.DAYS.toSeconds(35); break; + case 8: burnAfter = TimeUnit.DAYS.toSeconds(90); break; default: burnAfter = 0; break; } listener.onTimeSelected(burnAfter); diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 71c05125b..0b15bd705 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -56,6 +56,7 @@ @string/autodel_after_1_day @string/autodel_after_1_week @string/after_5_weeks + @string/autodel_after_90_days diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a7e06b4bc..4d24b63f4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -851,6 +851,7 @@ After 1 day After 1 week After 5 weeks + After 90 days After 1 year From 82ef0560a58ddfd127bb653ee8aca54a92150e93 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 6 Aug 2025 15:19:40 +0200 Subject: [PATCH 2/6] change to 1 year --- .../org/thoughtcrime/securesms/EphemeralMessagesDialog.java | 2 +- src/main/res/values/arrays.xml | 2 +- src/main/res/values/strings.xml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java index 63b5c4eb8..fab25cee2 100644 --- a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java +++ b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java @@ -67,7 +67,7 @@ public class EphemeralMessagesDialog { case 5: burnAfter = TimeUnit.DAYS.toSeconds(1); break; case 6: burnAfter = TimeUnit.DAYS.toSeconds(7); break; case 7: burnAfter = TimeUnit.DAYS.toSeconds(35); break; - case 8: burnAfter = TimeUnit.DAYS.toSeconds(90); break; + case 8: burnAfter = TimeUnit.DAYS.toSeconds(365); break; default: burnAfter = 0; break; } listener.onTimeSelected(burnAfter); diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 53a8137d6..c48e1bf4f 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -56,7 +56,7 @@ @string/autodel_after_1_day @string/autodel_after_1_week @string/after_5_weeks - @string/autodel_after_90_days + @string/autodel_after_1_year diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ab57ff341..369726a87 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -896,7 +896,6 @@ After 1 day After 1 week After 5 weeks - After 90 days After 1 year From c0a65e2e9fe7b34ce7425c78e7284321d676effa Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 6 Aug 2025 15:48:27 +0200 Subject: [PATCH 3/6] properly set the pre-selected option --- .../org/thoughtcrime/securesms/EphemeralMessagesDialog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java index fab25cee2..820cf96f4 100644 --- a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java +++ b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java @@ -104,7 +104,10 @@ public class EphemeralMessagesDialog { if (timespan < TimeUnit.DAYS.toSeconds(35)) { return 6; // 1 week } - return 7; // 5 weeks + if (timespan < TimeUnit.DAYS.toSeconds(365)) { + return 7; // 5 weeks + } + return 8; // 5 weeks } } From 321b5a223bc1a9bdeb7f78433fb6837e2f7d627d Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 8 Aug 2025 00:42:29 +0200 Subject: [PATCH 4/6] fix comment for 1 year value --- .../org/thoughtcrime/securesms/EphemeralMessagesDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java index 820cf96f4..ecc0881cf 100644 --- a/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java +++ b/src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java @@ -107,7 +107,7 @@ public class EphemeralMessagesDialog { if (timespan < TimeUnit.DAYS.toSeconds(365)) { return 7; // 5 weeks } - return 8; // 5 weeks + return 8; // 1 year } } From 9e4b74404671e8ecc3cf48fd7560aff109b56623 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 8 Aug 2025 15:36:24 +0200 Subject: [PATCH 5/6] set ephemeral timer stock strings for 1 year --- src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java | 2 ++ src/main/res/values/strings.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index a15d6d05c..57dbb94d7 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -226,6 +226,8 @@ public class DcHelper { dcContext.setStockTranslation(155, context.getString(R.string.ephemeral_timer_days_by_other)); dcContext.setStockTranslation(156, context.getString(R.string.ephemeral_timer_weeks_by_you)); dcContext.setStockTranslation(157, context.getString(R.string.ephemeral_timer_weeks_by_other)); + dcContext.setStockTranslation(158, context.getString(R.string.ephemeral_timer_1_year_by_you)); + dcContext.setStockTranslation(159, context.getString(R.string.ephemeral_timer_1_year_by_other)); // HACK: svg does not handle entities correctly and shows `"` as the text `quot;`. // until that is fixed, we fix the most obvious errors (core uses encode_minimal, so this does not affect so many characters) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 369726a87..cced2242a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -956,6 +956,9 @@ You set disappearing messages timer to 1 week. Disappearing messages timer set to 1 week by %1$s. + You set disappearing messages timer to 1 year. + + Disappearing messages timer set to 1 year by %1$s. You set disappearing messages timer to %1$s minutes. From e53a1f0b227727a1de33d39d3ffbd35360a687b9 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 13 Aug 2025 13:54:41 +0200 Subject: [PATCH 6/6] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bfbdb1f6..7a7e362d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,10 @@ ## Unreleased -* allow to clone email chats +* add "After 1 year" option to disappearing messages * improve image quality when setting group avatars * add Estonian translation, update other translations +* allow to clone email chats * fix some small bugs * update to core 2.11.0