Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace 4 weeks option with 5 weeks option #1786

Merged
merged 1 commit into from Feb 3, 2021
Merged

Replace 4 weeks option with 5 weeks option #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions res/values/arrays.xml
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@
<!-- 4 --> <item>@string/autodel_after_1_hour</item>
<!-- 5 --> <item>@string/autodel_after_1_day</item>
<!-- 6 --> <item>@string/autodel_after_1_week</item>
<!-- 7 --> <item>@string/autodel_after_4_weeks</item>
<!-- 7 --> <item>@string/after_5_weeks</item>
</string-array>

<string-array name="mute_durations">
Expand All @@ -154,7 +154,7 @@
<item>@string/autodel_after_1_hour</item>
<item>@string/autodel_after_1_day</item>
<item>@string/autodel_after_1_week</item>
<item>@string/autodel_after_4_weeks</item>
<item>@string/after_5_weeks</item>
<item>@string/autodel_after_1_year</item>
</string-array>

Expand All @@ -163,7 +163,7 @@
<item>3600</item>
<item>86400</item>
<item>604800</item>
<item>2419200</item>
<item>3024000</item>
<item>31536000</item>
</string-array>

Expand All @@ -173,7 +173,7 @@
<item>@string/autodel_after_1_hour</item>
<item>@string/autodel_after_1_day</item>
<item>@string/autodel_after_1_week</item>
<item>@string/autodel_after_4_weeks</item>
<item>@string/after_5_weeks</item>
<item>@string/autodel_after_1_year</item>
</string-array>

Expand All @@ -183,7 +183,7 @@
<item>3600</item>
<item>86400</item>
<item>604800</item>
<item>2419200</item>
<item>3024000</item>
<item>31536000</item>
</string-array>

Expand Down
2 changes: 1 addition & 1 deletion res/values/strings.xml
View file
Open in desktop
Expand Up @@ -563,7 +563,7 @@
<string name="autodel_after_1_hour">After 1 hour</string>
<string name="autodel_after_1_day">After 1 day</string>
<string name="autodel_after_1_week">After 1 week</string>
<string name="autodel_after_4_weeks">After 4 weeks</string>
<string name="after_5_weeks">After 5 weeks</string>
<string name="autodel_after_1_year">After 1 year</string>

<!-- autocrypt -->
Expand Down
6 changes: 3 additions & 3 deletions src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@ public static void show(final Context context, int currentSelectedTime, final @N
case 4: burnAfter = TimeUnit.HOURS.toSeconds(1); break;
case 5: burnAfter = TimeUnit.DAYS.toSeconds(1); break;
case 6: burnAfter = TimeUnit.DAYS.toSeconds(7); break;
case 7: burnAfter = TimeUnit.DAYS.toSeconds(28); break;
case 7: burnAfter = TimeUnit.DAYS.toSeconds(35); break;
default: burnAfter = 0; break;
}
listener.onTimeSelected(burnAfter);
Expand Down Expand Up @@ -99,10 +99,10 @@ private static int getPreselection(int timespan) {
if (timespan < TimeUnit.DAYS.toSeconds(7)) {
return 5; // 1 day
}
if (timespan < TimeUnit.DAYS.toSeconds(28)) {
if (timespan < TimeUnit.DAYS.toSeconds(35)) {
return 6; // 1 week
}
return 7; // 4 weeks
return 7; // 5 weeks
}

}