mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-06-28 08:03:00 +00:00
Code Issues Releases Wiki Activity

PlayerService: runtime-assert that we get passed a service

Browse Source 
We directly call the `getService` function after receiving the
argument, so resolving the WeakPointer should never return `null` in
our case.
Of course there could be a race condition in theory, but I feel like
if that happens we have bigger problems?
This commit is contained in:
Profpatsch 2025-05-13 17:11:52 +02:00
parent 36115c3164
commit cf8fe95abf
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
View File

@ -220,11 +220,18 @@ public final class PlayQueueActivity extends AppCompatActivity
} }
@Override @Override
public void onServiceConnected(final ComponentName name, final IBinder service) { public void onServiceConnected(final ComponentName name, final IBinder binder) {
Log.d(TAG, "Player service is connected"); Log.d(TAG, "Player service is connected");
if (service instanceof PlayerService.LocalBinder) { if (binder instanceof PlayerService.LocalBinder) {
player = ((PlayerService.LocalBinder) service).getService().getPlayer(); @Nullable final PlayerService s =
((PlayerService.LocalBinder) binder).getService();
if (s == null) {
throw new IllegalArgumentException(
"PlayerService.LocalBinder.getService() must never be"
+ "null after the service connects");
}
player = s.getPlayer();
} }
if (player == null || player.getPlayQueue() == null || player.exoPlayerIsNull()) { if (player == null || player.getPlayQueue() == null || player.exoPlayerIsNull()) {

12
app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
View File

@ -188,9 +188,15 @@ public final class PlayerHolder {
} }
final PlayerService.LocalBinder localBinder = (PlayerService.LocalBinder) service; final PlayerService.LocalBinder localBinder = (PlayerService.LocalBinder) service;
playerService = localBinder.getService(); @Nullable final PlayerService s = localBinder.getService();
if (s == null) {
throw new IllegalArgumentException(
"PlayerService.LocalBinder.getService() must never be"
+ "null after the service connects");
}
playerService = s;
if (listener != null) { if (listener != null) {
listener.onServiceConnected(playerService); listener.onServiceConnected(s);
getPlayer().ifPresent(p -> listener.onPlayerConnected(p, playAfterConnect)); getPlayer().ifPresent(p -> listener.onPlayerConnected(p, playAfterConnect));
} }
startPlayerListener(); startPlayerListener();
@ -198,7 +204,7 @@ public final class PlayerHolder {
// notify the main activity that binding the service has completed, so that it can // notify the main activity that binding the service has completed, so that it can
// open the bottom mini-player // open the bottom mini-player
NavigationHelper.sendPlayerStartedEvent(localBinder.getService()); NavigationHelper.sendPlayerStartedEvent(s);
} }
} }