Skip to content

Commit 40ea51e

Browse files
committed
Add more checking frequencies, use DurationListPreference
1 parent 0397a31 commit 40ea51e

5 files changed

Lines changed: 22 additions & 26 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/feed/notifications/ScheduleOptions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ data class ScheduleOptions(
1919
fun from(context: Context): ScheduleOptions {
2020
val preferences = PreferenceManager.getDefaultSharedPreferences(context)
2121
return ScheduleOptions(
22-
interval = TimeUnit.HOURS.toMillis(
22+
interval = TimeUnit.SECONDS.toMillis(
2323
preferences.getString(
2424
context.getString(R.string.streams_notifications_interval_key),
25-
context.getString(R.string.streams_notifications_interval_default)
25+
null
2626
)?.toLongOrNull() ?: context.getString(
2727
R.string.streams_notifications_interval_default
2828
).toLong()

app/src/main/res/values-ru/strings.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -703,11 +703,6 @@
703703
<string name="streams_notifications_interval_title">Частота проверки</string>
704704
<string name="enable_streams_notifications_title">Уведомлять о новых видео</string>
705705
<string name="enable_streams_notifications_summary">Получать уведомления о новых видео из каналов, на которые Вы подписаны</string>
706-
<string name="every_hour">Каждый час</string>
707-
<string name="every_two_hours">Каждые 2 часа</string>
708-
<string name="every_three_hours">Каждые 3 часа</string>
709-
<string name="twice_per_day">Дважды в день</string>
710-
<string name="every_day">Каждый день</string>
711706
<string name="streams_notifications_network_title">Тип подключения</string>
712707
<string name="any_network">Любая сеть</string>
713708
<string name="notifications_disabled">Уведомления отключены</string>

app/src/main/res/values/settings_keys.xml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,20 +1271,26 @@
12711271
<string name="recaptcha_cookies_key" translatable="false">recaptcha_cookies_key</string>
12721272
<string name="enable_streams_notifications" translatable="false">enable_streams_notifications</string>
12731273
<string name="streams_notifications_interval_key" translatable="false">streams_notifications_interval</string>
1274-
<string name="streams_notifications_interval_default" translatable="false">3</string>
1275-
<string-array name="streams_notifications_interval_values">
1276-
<item>1</item>
1277-
<item>2</item>
1278-
<item>3</item>
1279-
<item>12</item>
1280-
<item>24</item>
1281-
</string-array>
1274+
<string name="streams_notifications_interval_default" translatable="false">14400</string>
1275+
<!-- Values will be localized in runtime -->
12821276
<string-array name="streams_notifications_interval_description">
1283-
<item>@string/every_hour</item>
1284-
<item>@string/every_two_hours</item>
1285-
<item>@string/every_three_hours</item>
1286-
<item>@string/twice_per_day</item>
1287-
<item>@string/every_day</item>
1277+
<item>15 minutes</item>
1278+
<item>30 minutes</item>
1279+
<item>1 hour</item>
1280+
<item>2 hours</item>
1281+
<item>4 hours</item>
1282+
<item>12 hours</item>
1283+
<item>1 day</item>
1284+
</string-array>
1285+
<!-- Notifications check frequency in seconds -->
1286+
<string-array name="streams_notifications_interval_values">
1287+
<item>900</item>
1288+
<item>1800</item>
1289+
<item>3600</item>
1290+
<item>7200</item>
1291+
<item>14400</item>
1292+
<item>43200</item>
1293+
<item>86400</item>
12881294
</string-array>
12891295
<string name="streams_notifications_network_key" translatable="false">streams_notifications_network</string>
12901296
<string name="streams_notifications_network_any" translatable="false">any</string>

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,11 +539,6 @@
539539
<string name="enable_streams_notifications_title">New streams notifications</string>
540540
<string name="enable_streams_notifications_summary">Notify about new streams from subscriptions</string>
541541
<string name="streams_notifications_interval_title">Checking frequency</string>
542-
<string name="every_hour">Every hour</string>
543-
<string name="every_two_hours">Every 2 hours</string>
544-
<string name="every_three_hours">Every 3 hours</string>
545-
<string name="twice_per_day">Twice per day</string>
546-
<string name="every_day">Every day</string>
547542
<string name="streams_notifications_network_title">Required network connection</string>
548543
<string name="any_network">Any network</string>
549544
<!-- Updates Settings -->

app/src/main/res/xml/notifications_settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
app:singleLineTitle="false"
1313
app:iconSpaceReserved="false" />
1414

15-
<ListPreference
15+
<org.schabi.newpipe.settings.custom.DurationListPreference
1616
android:defaultValue="@string/streams_notifications_interval_default"
1717
android:dependency="@string/enable_streams_notifications"
1818
android:entries="@array/streams_notifications_interval_description"

0 commit comments

Comments
 (0)