diff --git a/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java b/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java index d817032ee..07e0eb7d3 100644 --- a/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java +++ b/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java @@ -4,11 +4,11 @@ import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -@IntDef({NotificationMode.DISABLED, NotificationMode.ENABLED_DEFAULT}) +@IntDef({NotificationMode.DISABLED, NotificationMode.ENABLED}) @Retention(RetentionPolicy.SOURCE) public @interface NotificationMode { int DISABLED = 0; - int ENABLED_DEFAULT = 1; + int ENABLED = 1; //other values reserved for the future } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index dcda6db0b..8ed6b5149 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -414,7 +414,7 @@ public class ChannelFragment extends BaseListInfoFragment } private void setNotify(final boolean isEnabled) { - final int mode = isEnabled ? NotificationMode.ENABLED_DEFAULT : NotificationMode.DISABLED; + final int mode = isEnabled ? NotificationMode.ENABLED : NotificationMode.DISABLED; disposables.add( subscriptionManager.updateNotificationMode(currentInfo.getServiceId(), currentInfo.getUrl(), mode) diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt index ee16a403d..82e923d94 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt @@ -36,7 +36,7 @@ class NotificationWorker( .map { feed -> feed.mapNotNull { x -> x.value?.takeIf { - it.notificationMode == NotificationMode.ENABLED_DEFAULT && + it.notificationMode == NotificationMode.ENABLED && it.newStreamsCount > 0 } } diff --git a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.kt b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.kt index eb94fb843..9c4797237 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.kt @@ -92,7 +92,7 @@ class NotificationsChannelsConfigFragment : Fragment(), ModeToggleListener { val subscriptions = adapter?.getCurrentList() ?: return val mode = subscriptions.firstOrNull()?.notificationMode ?: return val newMode = when (mode) { - NotificationMode.DISABLED -> NotificationMode.ENABLED_DEFAULT + NotificationMode.DISABLED -> NotificationMode.ENABLED else -> NotificationMode.DISABLED } val subscriptionManager = SubscriptionManager(requireContext()) diff --git a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.kt b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.kt index 1689747e2..2fa916166 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.kt +++ b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.kt @@ -85,7 +85,7 @@ class NotificationsConfigAdapter( val mode = if (checkedTextView.isChecked) { NotificationMode.DISABLED } else { - NotificationMode.ENABLED_DEFAULT + NotificationMode.ENABLED } listener.onModeToggle(adapterPosition, mode) }