From 8627efd0a1dd3e8f3afc4e7ade8bc7f7241f3fd5 Mon Sep 17 00:00:00 2001
From: ThetaDev <t.testboy@gmail.com>
Date: Sun, 23 Oct 2022 11:28:34 +0200
Subject: [PATCH] fix: get notified menu option on all tabs

---
 .../list/channel/ChannelFragment.java         | 91 ++++++++++++++++++
 .../list/channel/ChannelTabFragment.java      |  8 ++
 .../list/channel/ChannelVideosFragment.java   | 95 ++++---------------
 app/src/main/res/menu/menu_channel_videos.xml | 14 ---
 4 files changed, 118 insertions(+), 90 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_channel_videos.xml

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 6989552f2..4938d1c00 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
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.fragments.list.channel;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -14,6 +15,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.subscription.NotificationMode;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.databinding.FragmentChannelBinding;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.UserAction;
@@ -21,14 +24,21 @@ import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.linkhandler.ChannelTabHandler;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.detail.TabAdapter;
+import org.schabi.newpipe.local.feed.notifications.NotificationHelper;
+import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
+import java.util.List;
+
 import icepick.State;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
@@ -41,8 +51,12 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
 
     private ChannelInfo currentInfo;
     private Disposable currentWorker;
+    private Disposable subscriptionMonitor;
+    private final CompositeDisposable disposables = new CompositeDisposable();
+    private SubscriptionManager subscriptionManager;
 
     private MenuItem menuRssButton;
+    private MenuItem menuNotifyButton;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -78,6 +92,12 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        subscriptionManager = new SubscriptionManager(activity);
+    }
+
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater,
                              @Nullable final ViewGroup container,
@@ -98,6 +118,13 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        if (currentWorker != null) {
+            currentWorker.dispose();
+        }
+        if (subscriptionMonitor != null) {
+            subscriptionMonitor.dispose();
+        }
+        disposables.clear();
         binding = null;
     }
 
@@ -116,12 +143,19 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
                     + "menu = [" + menu + "], inflater = [" + inflater + "]");
         }
         menuRssButton = menu.findItem(R.id.menu_item_rss);
+        menuNotifyButton = menu.findItem(R.id.menu_item_notify);
         updateRssButton();
+        monitorSubscription();
     }
 
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.menu_item_notify:
+                final boolean value = !item.isChecked();
+                item.setEnabled(false);
+                setNotify(value);
+                break;
             case R.id.action_settings:
                 NavigationHelper.openSettings(requireContext());
                 break;
@@ -153,6 +187,62 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
         }
     }
 
+    private void monitorSubscription() {
+        if (currentInfo != null) {
+            final Observable<List<SubscriptionEntity>> observable = subscriptionManager
+                    .subscriptionTable()
+                    .getSubscriptionFlowable(currentInfo.getServiceId(), currentInfo.getUrl())
+                    .toObservable();
+
+            if (subscriptionMonitor != null) {
+                subscriptionMonitor.dispose();
+            }
+            subscriptionMonitor = observable
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(getSubscribeUpdateMonitor());
+        }
+    }
+
+    private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor() {
+        return (List<SubscriptionEntity> subscriptionEntities) -> {
+            if (subscriptionEntities.isEmpty()) {
+                updateNotifyButton(null);
+            } else {
+                final SubscriptionEntity subscription = subscriptionEntities.get(0);
+                updateNotifyButton(subscription);
+            }
+        };
+    }
+
+    private void updateNotifyButton(@Nullable final SubscriptionEntity subscription) {
+        if (menuNotifyButton == null) {
+            return;
+        }
+        if (subscription != null) {
+            menuNotifyButton.setEnabled(
+                    NotificationHelper.areNewStreamsNotificationsEnabled(requireContext())
+            );
+            menuNotifyButton.setChecked(
+                    subscription.getNotificationMode() == NotificationMode.ENABLED
+            );
+        }
+
+        menuNotifyButton.setVisible(subscription != null);
+    }
+
+    private void setNotify(final boolean isEnabled) {
+        disposables.add(
+                subscriptionManager
+                        .updateNotificationMode(
+                                currentInfo.getServiceId(),
+                                currentInfo.getUrl(),
+                                isEnabled ? NotificationMode.ENABLED : NotificationMode.DISABLED)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe()
+        );
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
@@ -213,5 +303,6 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo> {
         setInitialData(info.getServiceId(), info.getOriginalUrl(), info.getName());
         updateTabs();
         updateRssButton();
+        monitorSubscription();
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java
index 12514a55c..21613d717 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java
@@ -2,6 +2,8 @@ package org.schabi.newpipe.fragments.list.channel;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -45,6 +47,12 @@ public class ChannelTabFragment extends BaseListInfoFragment<InfoItem, ChannelTa
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(false);
+    }
+
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater,
                              @Nullable final ViewGroup container,
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelVideosFragment.java
index 9f8c83ce7..f147e4f9d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelVideosFragment.java
@@ -11,16 +11,12 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
 import androidx.core.content.ContextCompat;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -51,7 +47,6 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -89,8 +84,6 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
     private ChannelHeaderBinding headerBinding;
     private PlaylistControlBinding playlistControlBinding;
 
-    private MenuItem menuNotifyButton;
-
     public static ChannelVideosFragment getInstance(@NonNull final ChannelInfo channelInfo) {
         final ChannelVideosFragment instance = new ChannelVideosFragment();
         instance.setInitialData(channelInfo.getServiceId(), channelInfo.getUrl(),
@@ -123,6 +116,12 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(false);
+    }
+
     @Override
     public void onAttach(@NonNull final Context context) {
         super.onAttach(context);
@@ -176,71 +175,6 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
         headerBinding.subChannelAvatarView.setOnClickListener(this);
     }
 
-    /*//////////////////////////////////////////////////////////////////////////
-    // Menu
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onCreateOptionsMenu(@NonNull final Menu menu,
-                                    @NonNull final MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        final ActionBar supportActionBar = activity.getSupportActionBar();
-        if (useAsFrontPage && supportActionBar != null) {
-            supportActionBar.setDisplayHomeAsUpEnabled(false);
-        } else {
-            inflater.inflate(R.menu.menu_channel_videos, menu);
-
-            if (DEBUG) {
-                Log.d(TAG, "onCreateOptionsMenu() called with: "
-                        + "menu = [" + menu + "], inflater = [" + inflater + "]");
-            }
-            menuNotifyButton = menu.findItem(R.id.menu_item_notify);
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_item_notify:
-                final boolean value = !item.isChecked();
-                item.setEnabled(false);
-                setNotify(value);
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-        return true;
-    }
-
-    private void updateNotifyButton(@Nullable final SubscriptionEntity subscription) {
-        if (menuNotifyButton == null) {
-            return;
-        }
-        if (subscription != null) {
-            menuNotifyButton.setEnabled(
-                    NotificationHelper.areNewStreamsNotificationsEnabled(requireContext())
-            );
-            menuNotifyButton.setChecked(
-                    subscription.getNotificationMode() == NotificationMode.ENABLED
-            );
-        }
-
-        menuNotifyButton.setVisible(subscription != null);
-    }
-
-    private void setNotify(final boolean isEnabled) {
-        disposables.add(
-                subscriptionManager
-                        .updateNotificationMode(
-                                currentInfo.getServiceId(),
-                                currentInfo.getUrl(),
-                                isEnabled ? NotificationMode.ENABLED : NotificationMode.DISABLED)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe()
-        );
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Channel Subscription
     //////////////////////////////////////////////////////////////////////////*/
@@ -357,7 +291,6 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
                         info.getAvatarUrl(),
                         info.getDescription(),
                         info.getSubscriberCount());
-                updateNotifyButton(null);
                 subscribeButtonMonitor = monitorSubscribeButton(
                         headerBinding.channelSubscribeButton, mapOnSubscribe(channel, info));
             } else {
@@ -365,7 +298,6 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
                     Log.d(TAG, "Found subscription to this channel!");
                 }
                 final SubscriptionEntity subscription = subscriptionEntities.get(0);
-                updateNotifyButton(subscription);
                 subscribeButtonMonitor = monitorSubscribeButton(
                         headerBinding.channelSubscribeButton, mapOnUnsubscribe(subscription));
             }
@@ -418,6 +350,19 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
                 .show();
     }
 
+    private void setNotify(final boolean isEnabled) {
+        disposables.add(
+                subscriptionManager
+                        .updateNotificationMode(
+                                currentInfo.getServiceId(),
+                                currentInfo.getUrl(),
+                                isEnabled ? NotificationMode.ENABLED : NotificationMode.DISABLED)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe()
+        );
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Load and handle
     //////////////////////////////////////////////////////////////////////////*/
@@ -502,8 +447,6 @@ public class ChannelVideosFragment extends BaseListInfoFragment<StreamInfoItem,
             headerBinding.subChannelTitleView.setVisibility(View.GONE);
         }
 
-        // updateRssButton();
-
         // PlaylistControls should be visible only if there is some item in
         // infoListAdapter other than header
         if (infoListAdapter.getItemCount() != 1) {
diff --git a/app/src/main/res/menu/menu_channel_videos.xml b/app/src/main/res/menu/menu_channel_videos.xml
deleted file mode 100644
index a3b2e7ae0..000000000
--- a/app/src/main/res/menu/menu_channel_videos.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragments.list.impl.ChannelFragment">
-
-    <item
-        android:id="@+id/menu_item_notify"
-        android:checkable="true"
-        android:orderInCategory="1"
-        android:title="@string/get_notified"
-        android:visible="false"
-        app:showAsAction="never"
-        tools:visible="true" />
-</menu>