Merge pull request #11261 from Stypox/fix-media-session-ui-npe

Fix crash in MediaSessionPlayerUi while destroying player
TeamNewPipe · Jul 11, 2024 · 6f71c00 · 6f71c00
2 parents 9828586 + 9f766eb
commit 6f71c00
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java
@@ -38,7 +38,9 @@ public class MediaSessionPlayerUi extends PlayerUi
  implements SharedPreferences.OnSharedPreferenceChangeListener {
  private static final String TAG = "MediaSessUi";
 
+ @Nullable
  private MediaSessionCompat mediaSession;
+ @Nullable
  private MediaSessionConnector sessionConnector;
 
  private final String ignoreHardwareMediaButtonsKey;
@@ -198,6 +200,11 @@ private void updateMediaSessionActions() {
  return;
  }
 
+ if (sessionConnector == null) {
+ // sessionConnector will be null after destroyPlayer is called
+ return;
+ }
+
  // only use the fourth and fifth actions (the settings page also shows only the last 2 on
  // Android 13+)
  final List<NotificationActionData> newNotificationActions = IntStream.of(3, 4)