Factor out shouldAddMarkAsWatched as a shared function

nschulzke · nschulzke · commit dee32c3dc575 · 2021-11-13T10:18:17.000-07:00
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -380,13 +380,7 @@ protected void showStreamDialog(final StreamInfoItem item) {
         }
 
         // show "mark as watched" only when watch history is enabled
-        final boolean isWatchHistoryEnabled = PreferenceManager
-                .getDefaultSharedPreferences(context)
-                .getBoolean(getString(R.string.enable_watch_history_key), false);
-        if (item.getStreamType() != StreamType.AUDIO_LIVE_STREAM
-                && item.getStreamType() != StreamType.LIVE_STREAM
-                && isWatchHistoryEnabled
-        ) {
+        if (StreamDialogEntry.shouldAddMarkAsWatched(item.getStreamType(), context)) {
             entries.add(
                     StreamDialogEntry.mark_as_watched
             );
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -15,7 +15,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.preference.PreferenceManager;
 import androidx.viewbinding.ViewBinding;
 
 import org.reactivestreams.Subscriber;
@@ -178,13 +177,7 @@ protected void showStreamDialog(final StreamInfoItem item) {
         }
 
         // show "mark as watched" only when watch history is enabled
-        final boolean isWatchHistoryEnabled = PreferenceManager
-                .getDefaultSharedPreferences(context)
-                .getBoolean(getString(R.string.enable_watch_history_key), false);
-        if (item.getStreamType() != StreamType.AUDIO_LIVE_STREAM
-                && item.getStreamType() != StreamType.LIVE_STREAM
-                && isWatchHistoryEnabled
-        ) {
+        if (StreamDialogEntry.shouldAddMarkAsWatched(item.getStreamType(), context)) {
             entries.add(
                     StreamDialogEntry.mark_as_watched
             );
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -356,13 +356,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         }
 
         // show "mark as watched" only when watch history is enabled
-        val isWatchHistoryEnabled = PreferenceManager
-            .getDefaultSharedPreferences(context)
-            .getBoolean(getString(R.string.enable_watch_history_key), false)
-        if (item.streamType != StreamType.AUDIO_LIVE_STREAM &&
-            item.streamType != StreamType.LIVE_STREAM &&
-            isWatchHistoryEnabled
-        ) {
+        if (StreamDialogEntry.shouldAddMarkAsWatched(item.streamType, context)) {
             entries.add(
                 StreamDialogEntry.mark_as_watched
             )
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -14,7 +14,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.preference.PreferenceManager;
 import androidx.viewbinding.ViewBinding;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -369,13 +368,10 @@ private void showStreamDialog(final StreamStatisticsEntry item) {
         }
 
         // show "mark as watched" only when watch history is enabled
-        final boolean isWatchHistoryEnabled = PreferenceManager
-                .getDefaultSharedPreferences(context)
-                .getBoolean(getString(R.string.enable_watch_history_key), false);
-        if (item.getStreamEntity().getStreamType() != StreamType.AUDIO_LIVE_STREAM
-                && item.getStreamEntity().getStreamType() != StreamType.LIVE_STREAM
-                && isWatchHistoryEnabled
-        ) {
+        if (StreamDialogEntry.shouldAddMarkAsWatched(
+                item.getStreamEntity().getStreamType(),
+                context
+        )) {
             entries.add(
                     StreamDialogEntry.mark_as_watched
             );
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -19,7 +19,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
@@ -785,13 +784,10 @@ protected void showStreamItemDialog(final PlaylistStreamEntry item) {
         }
 
         // show "mark as watched" only when watch history is enabled
-        final boolean isWatchHistoryEnabled = PreferenceManager
-                .getDefaultSharedPreferences(context)
-                .getBoolean(getString(R.string.enable_watch_history_key), false);
-        if (item.getStreamEntity().getStreamType() != StreamType.AUDIO_LIVE_STREAM
-                && item.getStreamEntity().getStreamType() != StreamType.LIVE_STREAM
-                && isWatchHistoryEnabled
-        ) {
+        if (StreamDialogEntry.shouldAddMarkAsWatched(
+                item.getStreamEntity().getStreamType(),
+                context
+        )) {
             entries.add(
                     StreamDialogEntry.mark_as_watched
             );
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -5,10 +5,12 @@
 import android.widget.Toast;
 
 import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -191,6 +193,16 @@ public interface StreamDialogEntryAction {
         void onClick(Fragment fragment, StreamInfoItem infoItem);
     }
 
+    public static boolean shouldAddMarkAsWatched(final StreamType streamType,
+                                                 final Context context) {
+        final boolean isWatchHistoryEnabled = PreferenceManager
+                .getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.enable_watch_history_key), false);
+        return streamType != StreamType.AUDIO_LIVE_STREAM
+                && streamType != StreamType.LIVE_STREAM
+                && isWatchHistoryEnabled;
+    }
+
     /////////////////////////////////////////////
     // private method to open channel fragment //
     /////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -356,13 +356,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`// show "mark as watched" only when watch history is enabled`
`359`		`- val isWatchHistoryEnabled = PreferenceManager`
`360`		`- .getDefaultSharedPreferences(context)`
`361`		`- .getBoolean(getString(R.string.enable_watch_history_key), false)`
`362`		`- if (item.streamType != StreamType.AUDIO_LIVE_STREAM &&`
`363`		`- item.streamType != StreamType.LIVE_STREAM &&`
`364`		`- isWatchHistoryEnabled`
`365`		`- ) {`
	`359`	`+ if (StreamDialogEntry.shouldAddMarkAsWatched(item.streamType, context)) {`
`366`	`360`	`entries.add(`
`367`	`361`	`StreamDialogEntry.mark_as_watched`
`368`	`362`	`)`