Merge pull request #3467 from deltachat/adb/issue-3437

add "After 1 year" option to disappearing messages

Author: adbenitez

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
 

src/main/java/org/thoughtcrime/securesms/EphemeralMessagesDialog.java

@@ -67,6 +67,7 @@ public static void show(final Context context, int currentSelectedTime, final @N
                         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(365); break;
                         default: burnAfter = 0; break;
                     }
                     listener.onTimeSelected(burnAfter);
@@ -103,7 +104,10 @@ private static int getPreselection(int timespan) {
         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; // 1 year
     }
 
 }

src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java

@@ -226,6 +226,8 @@ public static void setStockTranslations(Context context) {
     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)

src/main/res/values/arrays.xml

@@ -56,6 +56,7 @@
         <!-- 5 --> <item>@string/autodel_after_1_day</item>
         <!-- 6 --> <item>@string/autodel_after_1_week</item>
         <!-- 7 --> <item>@string/after_5_weeks</item>
+        <!-- 8 --> <item>@string/autodel_after_1_year</item>
     </string-array>
 
     <string-array name="mute_durations">

src/main/res/values/strings.xml

@@ -956,6 +956,9 @@
     <string name="ephemeral_timer_1_week_by_you">You set disappearing messages timer to 1 week.</string>
     <!-- %1$s will be replaced by name and address of the contact -->
     <string name="ephemeral_timer_1_week_by_other">Disappearing messages timer set to 1 week by %1$s.</string>
+    <string name="ephemeral_timer_1_year_by_you">You set disappearing messages timer to 1 year.</string>
+    <!-- %1$s will be replaced by name of the contact -->
+    <string name="ephemeral_timer_1_year_by_other">Disappearing messages timer set to 1 year by %1$s.</string>
     <!-- %1$s will be replaced by the number of minutes (always >1) the timer is set to -->
     <string name="ephemeral_timer_minutes_by_you">You set disappearing messages timer to %1$s minutes.</string>
     <!-- %1$s will be replaced by the number of minutes (always >1) the timer is set to, %2$s will be replaced by name and address of the contact -->