baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Rename NotificationMode.ENABLED_DEFAULT to NotificationMode.ENABLED

Browse source
This commit is contained in:
TobiGr 2021-10-15 19:59:06 +02:00
parent 7c6140b331
commit 64a7978c7f
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java
View file

@ -4,11 +4,11 @@ import androidx.annotation.IntDef;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@IntDef({NotificationMode.DISABLED, NotificationMode.ENABLED_DEFAULT}) @IntDef({NotificationMode.DISABLED, NotificationMode.ENABLED})
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface NotificationMode { public @interface NotificationMode {
int DISABLED = 0; int DISABLED = 0;
int ENABLED_DEFAULT = 1; int ENABLED = 1;
//other values reserved for the future //other values reserved for the future
} }

2
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
View file

@ -414,7 +414,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
} }
private void setNotify(final boolean isEnabled) { 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( disposables.add(
subscriptionManager.updateNotificationMode(currentInfo.getServiceId(), subscriptionManager.updateNotificationMode(currentInfo.getServiceId(),
currentInfo.getUrl(), mode) currentInfo.getUrl(), mode)

2
app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt
View file

@ -36,7 +36,7 @@ class NotificationWorker(
.map { feed -> .map { feed ->
feed.mapNotNull { x -> feed.mapNotNull { x ->
x.value?.takeIf { x.value?.takeIf {
it.notificationMode == NotificationMode.ENABLED_DEFAULT && it.notificationMode == NotificationMode.ENABLED &&
it.newStreamsCount > 0 it.newStreamsCount > 0
} }
} }

2
app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.kt
View file

@ -92,7 +92,7 @@ class NotificationsChannelsConfigFragment : Fragment(), ModeToggleListener {
val subscriptions = adapter?.getCurrentList() ?: return val subscriptions = adapter?.getCurrentList() ?: return
val mode = subscriptions.firstOrNull()?.notificationMode ?: return val mode = subscriptions.firstOrNull()?.notificationMode ?: return
val newMode = when (mode) { val newMode = when (mode) {
NotificationMode.DISABLED -> NotificationMode.ENABLED_DEFAULT NotificationMode.DISABLED -> NotificationMode.ENABLED
else -> NotificationMode.DISABLED else -> NotificationMode.DISABLED
} }
val subscriptionManager = SubscriptionManager(requireContext()) val subscriptionManager = SubscriptionManager(requireContext())

2
app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.kt
View file

@ -85,7 +85,7 @@ class NotificationsConfigAdapter(
val mode = if (checkedTextView.isChecked) { val mode = if (checkedTextView.isChecked) {
NotificationMode.DISABLED NotificationMode.DISABLED
} else { } else {
NotificationMode.ENABLED_DEFAULT NotificationMode.ENABLED
} }
listener.onModeToggle(adapterPosition, mode) listener.onModeToggle(adapterPosition, mode)
} }