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

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

Browse source 
Fix crash in MediaSessionPlayerUi while destroying player
This commit is contained in:
Stypox 2024-07-11 23:17:43 +02:00 committed by GitHub
commit 6f71c000ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java
View file

@ -38,7 +38,9 @@ public class MediaSessionPlayerUi extends PlayerUi
implements SharedPreferences.OnSharedPreferenceChangeListener { implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "MediaSessUi"; private static final String TAG = "MediaSessUi";
@Nullable
private MediaSessionCompat mediaSession; private MediaSessionCompat mediaSession;
@Nullable
private MediaSessionConnector sessionConnector; private MediaSessionConnector sessionConnector;
private final String ignoreHardwareMediaButtonsKey; private final String ignoreHardwareMediaButtonsKey;
@ -198,6 +200,11 @@ public class MediaSessionPlayerUi extends PlayerUi
return; 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 // only use the fourth and fifth actions (the settings page also shows only the last 2 on
// Android 13+) // Android 13+)
final List<NotificationActionData> newNotificationActions = IntStream.of(3, 4) final List<NotificationActionData> newNotificationActions = IntStream.of(3, 4)