Notification Improvements

app/src/main/AndroidManifest.xml

@@ -44,8 +44,9 @@
         </receiver>
 
         <service
-                android:name=".player.MainPlayer"
-                android:exported="false">
+            android:name=".player.MainPlayer"
+            android:exported="false"
+            android:foregroundServiceType="mediaPlayback">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -258,7 +258,7 @@ private void showDialog(final List<AdapterChoiceItem> choices) {
 
         final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
         final LinearLayout rootLayout = (LinearLayout) inflater.inflate(
-                R.layout.preferred_player_dialog_view, null, false);
+                R.layout.single_choice_dialog_view, null, false);
         final RadioGroup radioGroup = rootLayout.findViewById(android.R.id.list);
 
         final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {

app/src/main/java/org/schabi/newpipe/player/BasePlayer.java

@@ -180,6 +180,8 @@ public abstract class BasePlayer implements
     @NonNull
     protected final HistoryRecordManager recordManager;
     @NonNull
+    protected final SharedPreferences sharedPreferences;
+    @NonNull
     protected final CustomTrackSelector trackSelector;
     @NonNull
     protected final PlayerDataSource dataSource;
@@ -211,6 +213,7 @@ public void onReceive(final Context ctx, final Intent intent) {
         setupBroadcastReceiver(intentFilter);
 
         this.recordManager = new HistoryRecordManager(context);
+        this.sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 
         this.progressUpdateReactor = new SerialDisposable();
         this.databaseUpdateReactor = new CompositeDisposable();
@@ -1239,7 +1242,15 @@ public void seekTo(final long positionMillis) {
             Log.d(TAG, "seekBy() called with: position = [" + positionMillis + "]");
         }
         if (simpleExoPlayer != null) {
-            simpleExoPlayer.seekTo(positionMillis);
+            // prevent invalid positions when fast-forwarding/-rewinding
+            long normalizedPositionMillis = positionMillis;
+            if (normalizedPositionMillis < 0) {
+                normalizedPositionMillis = 0;
+            } else if (normalizedPositionMillis > simpleExoPlayer.getDuration()) {
+                normalizedPositionMillis = simpleExoPlayer.getDuration();
+            }
+
+            simpleExoPlayer.seekTo(normalizedPositionMillis);
         }
     }
 

app/src/main/java/org/schabi/newpipe/player/MainPlayer.java

@@ -19,35 +19,18 @@
 
 package org.schabi.newpipe.player;
 
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.os.Binder;
-import android.os.Build;
 import android.os.IBinder;
-import androidx.preference.PreferenceManager;
 import android.util.DisplayMetrics;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import android.view.View;
-import android.widget.RemoteViews;
-
-import com.google.android.exoplayer2.Player;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 
-import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.BitmapUtils;
-import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
@@ -64,7 +47,6 @@ public final class MainPlayer extends Service {
 
     private VideoPlayerImpl playerImpl;
     private WindowManager windowManager;
-    private SharedPreferences sharedPreferences;
 
     private final IBinder mBinder = new MainPlayer.LocalBinder();
 
@@ -78,30 +60,26 @@ public enum PlayerType {
     // Notification
     //////////////////////////////////////////////////////////////////////////*/
 
-    static final int NOTIFICATION_ID = 123789;
-    private NotificationManager notificationManager;
-    private NotificationCompat.Builder notBuilder;
-    private RemoteViews notRemoteView;
-    private RemoteViews bigNotRemoteView;
-
-    static final String ACTION_CLOSE =
-            "org.schabi.newpipe.player.MainPlayer.CLOSE";
-    static final String ACTION_PLAY_PAUSE =
-            "org.schabi.newpipe.player.MainPlayer.PLAY_PAUSE";
-    static final String ACTION_OPEN_CONTROLS =
-            "org.schabi.newpipe.player.MainPlayer.OPEN_CONTROLS";
-    static final String ACTION_REPEAT =
-            "org.schabi.newpipe.player.MainPlayer.REPEAT";
-    static final String ACTION_PLAY_NEXT =
-            "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT";
-    static final String ACTION_PLAY_PREVIOUS =
-            "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS";
-    static final String ACTION_FAST_REWIND =
-            "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND";
-    static final String ACTION_FAST_FORWARD =
-            "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD";
-
-    private static final String SET_IMAGE_RESOURCE_METHOD = "setImageResource";
+    static final String ACTION_CLOSE
+            = "org.schabi.newpipe.player.MainPlayer.CLOSE";
+    static final String ACTION_PLAY_PAUSE
+            = "org.schabi.newpipe.player.MainPlayer.PLAY_PAUSE";
+    static final String ACTION_OPEN_CONTROLS
+            = "org.schabi.newpipe.player.MainPlayer.OPEN_CONTROLS";
+    static final String ACTION_REPEAT
+            = "org.schabi.newpipe.player.MainPlayer.REPEAT";
+    static final String ACTION_PLAY_NEXT
+            = "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_NEXT";
+    static final String ACTION_PLAY_PREVIOUS
+            = "org.schabi.newpipe.player.MainPlayer.ACTION_PLAY_PREVIOUS";
+    static final String ACTION_FAST_REWIND
+            = "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND";
+    static final String ACTION_FAST_FORWARD
+            = "org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD";
+    static final String ACTION_SHUFFLE
+            = "org.schabi.newpipe.player.MainPlayer.ACTION_SHUFFLE";
+    public static final String ACTION_RECREATE_NOTIFICATION
+            = "org.schabi.newpipe.player.MainPlayer.ACTION_RECREATE_NOTIFICATION";
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service's LifeCycle
@@ -113,9 +91,7 @@ public void onCreate() {
             Log.d(TAG, "onCreate() called");
         }
         assureCorrectAppLanguage(this);
-        notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
         windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         ThemeHelper.setTheme(this);
         createView();
@@ -143,7 +119,7 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
 
         if (Intent.ACTION_MEDIA_BUTTON.equals(intent.getAction())
                 || intent.getStringExtra(VideoPlayer.PLAY_QUEUE_KEY) != null) {
-            showNotificationAndStartForeground();
+            NotificationUtil.getInstance().createNotificationAndStartForeground(playerImpl, this);
         }
 
         playerImpl.handleIntent(intent);
@@ -176,7 +152,7 @@ public void stop(final boolean autoplayEnabled) {
             // So we should hide the notification at all.
             // When autoplay enabled such notification flashing is annoying so skip this case
             if (!autoplayEnabled) {
-                stopForeground(true);
+                NotificationUtil.getInstance().cancelNotificationAndStopForeground(this);
             }
         }
     }
@@ -227,11 +203,8 @@ private void onClose() {
             playerImpl.removePopupFromView();
             playerImpl.destroy();
         }
-        if (notificationManager != null) {
-            notificationManager.cancel(NOTIFICATION_ID);
-        }
 
-        stopForeground(true);
+        NotificationUtil.getInstance().cancelNotificationAndStopForeground(this);
         stopSelf();
     }
 
@@ -270,206 +243,6 @@ public void removeViewFromParent() {
         }
     }
 
-    private void showNotificationAndStartForeground() {
-        resetNotification();
-        if (getBigNotRemoteView() != null) {
-            getBigNotRemoteView().setProgressBar(R.id.notificationProgressBar, 100, 0, false);
-        }
-        if (getNotRemoteView() != null) {
-            getNotRemoteView().setProgressBar(R.id.notificationProgressBar, 100, 0, false);
-        }
-        startForeground(NOTIFICATION_ID, getNotBuilder().build());
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Notification
-    //////////////////////////////////////////////////////////////////////////*/
-
-    void resetNotification() {
-        notBuilder = createNotification();
-        playerImpl.timesNotificationUpdated = 0;
-    }
-
-    private NotificationCompat.Builder createNotification() {
-        notRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID,
-                R.layout.player_notification);
-        bigNotRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID,
-                R.layout.player_notification_expanded);
-
-        setupNotification(notRemoteView);
-        setupNotification(bigNotRemoteView);
-
-        final NotificationCompat.Builder builder = new NotificationCompat
-                .Builder(this, getString(R.string.notification_channel_id))
-                .setOngoing(true)
-                .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setCustomContentView(notRemoteView)
-                .setCustomBigContentView(bigNotRemoteView);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            setLockScreenThumbnail(builder);
-        }
-
-        builder.setPriority(NotificationCompat.PRIORITY_MAX);
-        return builder;
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private void setLockScreenThumbnail(final NotificationCompat.Builder builder) {
-        final boolean isLockScreenThumbnailEnabled = sharedPreferences.getBoolean(
-                getString(R.string.enable_lock_screen_video_thumbnail_key), true);
-
-        if (isLockScreenThumbnailEnabled) {
-            playerImpl.mediaSessionManager.setLockScreenArt(
-                    builder,
-                    getCenteredThumbnailBitmap()
-            );
-        } else {
-            playerImpl.mediaSessionManager.clearLockScreenArt(builder);
-        }
-    }
-
-    @Nullable
-    private Bitmap getCenteredThumbnailBitmap() {
-        final int screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
-        final int screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
-
-        return BitmapUtils.centerCrop(playerImpl.getThumbnail(), screenWidth, screenHeight);
-    }
-
-    private void setupNotification(final RemoteViews remoteViews) {
-        // Don't show anything until player is playing
-        if (playerImpl == null) {
-            return;
-        }
-
-        remoteViews.setTextViewText(R.id.notificationSongName, playerImpl.getVideoTitle());
-        remoteViews.setTextViewText(R.id.notificationArtist, playerImpl.getUploaderName());
-        remoteViews.setImageViewBitmap(R.id.notificationCover, playerImpl.getThumbnail());
-
-        remoteViews.setOnClickPendingIntent(R.id.notificationPlayPause,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                        new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
-        remoteViews.setOnClickPendingIntent(R.id.notificationStop,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                        new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
-        // Starts VideoDetailFragment or opens BackgroundPlayerActivity.
-        remoteViews.setOnClickPendingIntent(R.id.notificationContent,
-                PendingIntent.getActivity(this, NOTIFICATION_ID,
-                        getIntentForNotification(), PendingIntent.FLAG_UPDATE_CURRENT));
-        remoteViews.setOnClickPendingIntent(R.id.notificationRepeat,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                        new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
-
-
-        if (playerImpl.playQueue != null && playerImpl.playQueue.size() > 1) {
-            remoteViews.setInt(R.id.notificationFRewind, SET_IMAGE_RESOURCE_METHOD,
-                    R.drawable.exo_controls_previous);
-            remoteViews.setInt(R.id.notificationFForward, SET_IMAGE_RESOURCE_METHOD,
-                    R.drawable.exo_controls_next);
-            remoteViews.setOnClickPendingIntent(R.id.notificationFRewind,
-                    PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                            new Intent(ACTION_PLAY_PREVIOUS), PendingIntent.FLAG_UPDATE_CURRENT));
-            remoteViews.setOnClickPendingIntent(R.id.notificationFForward,
-                    PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                            new Intent(ACTION_PLAY_NEXT), PendingIntent.FLAG_UPDATE_CURRENT));
-        } else {
-            remoteViews.setInt(R.id.notificationFRewind, SET_IMAGE_RESOURCE_METHOD,
-                    R.drawable.exo_controls_rewind);
-            remoteViews.setInt(R.id.notificationFForward, SET_IMAGE_RESOURCE_METHOD,
-                    R.drawable.exo_controls_fastforward);
-            remoteViews.setOnClickPendingIntent(R.id.notificationFRewind,
-                    PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                            new Intent(ACTION_FAST_REWIND), PendingIntent.FLAG_UPDATE_CURRENT));
-            remoteViews.setOnClickPendingIntent(R.id.notificationFForward,
-                    PendingIntent.getBroadcast(this, NOTIFICATION_ID,
-                            new Intent(ACTION_FAST_FORWARD), PendingIntent.FLAG_UPDATE_CURRENT));
-        }
-
-        setRepeatModeIcon(remoteViews, playerImpl.getRepeatMode());
-    }
-
-    /**
-     * Updates the notification, and the play/pause button in it.
-     * Used for changes on the remoteView
-     *
-     * @param drawableId if != -1, sets the drawable with that id on the play/pause button
-     */
-    synchronized void updateNotification(final int drawableId) {
-        /*if (DEBUG) {
-            Log.d(TAG, "updateNotification() called with: drawableId = [" + drawableId + "]");
-        }*/
-        if (notBuilder == null) {
-            return;
-        }
-        if (drawableId != -1) {
-            if (notRemoteView != null) {
-                notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
-            }
-            if (bigNotRemoteView != null) {
-                bigNotRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
-            }
-        }
-        notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
-        playerImpl.timesNotificationUpdated++;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void setRepeatModeIcon(final RemoteViews remoteViews, final int repeatMode) {
-        if (remoteViews == null) {
-            return;
-        }
-
-        switch (repeatMode) {
-            case Player.REPEAT_MODE_OFF:
-                remoteViews.setInt(R.id.notificationRepeat,
-                        SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_repeat_off);
-                break;
-            case Player.REPEAT_MODE_ONE:
-                remoteViews.setInt(R.id.notificationRepeat,
-                        SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_repeat_one);
-                break;
-            case Player.REPEAT_MODE_ALL:
-                remoteViews.setInt(R.id.notificationRepeat,
-                        SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_repeat_all);
-                break;
-        }
-    }
-
-    private Intent getIntentForNotification() {
-        final Intent intent;
-        if (playerImpl.audioPlayerSelected() || playerImpl.popupPlayerSelected()) {
-            // Means we play in popup or audio only. Let's show BackgroundPlayerActivity
-            intent = NavigationHelper.getBackgroundPlayerActivityIntent(getApplicationContext());
-        } else {
-            // We are playing in fragment. Don't open another activity just show fragment. That's it
-            intent = NavigationHelper.getPlayerIntent(this, MainActivity.class, null, true);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.setAction(Intent.ACTION_MAIN);
-            intent.addCategory(Intent.CATEGORY_LAUNCHER);
-        }
-        return intent;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Getters
-    //////////////////////////////////////////////////////////////////////////*/
-
-    NotificationCompat.Builder getNotBuilder() {
-        return notBuilder;
-    }
-
-    RemoteViews getBigNotRemoteView() {
-        return bigNotRemoteView;
-    }
-
-    RemoteViews getNotRemoteView() {
-        return notRemoteView;
-    }
-
 
     public class LocalBinder extends Binder {