greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Crash] : avoid crash when leaving the application

Browse Source
This commit is contained in:
Olivier Bouillet 2020-09-25 21:56:09 +02:00
parent ae30ab708e
commit cdcfa8c28e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
View File

@ -113,8 +113,7 @@ public class VideoPlayerService extends Service {
if (playbackState if (playbackState
== ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped == ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped
Log.v(TAG, "ACTION_PAUSE: " + playbackState); Log.v(TAG, "ACTION_PAUSE: " + playbackState);
unregisterReceiver(myNoisyAudioStreamReceiver); safeUnregisterReceiver();
myNoisyAudioStreamReceiver = null;
} }
} }
}); });
@ -137,14 +136,9 @@ public class VideoPlayerService extends Service {
if (playerNotificationManager != null) { if (playerNotificationManager != null) {
playerNotificationManager.setPlayer(null); playerNotificationManager.setPlayer(null);
} }
//Was seeing an error when exiting the program about about not unregistering the receiver. //Was seeing an error when exiting the program about not unregistering the receiver.
try { safeUnregisterReceiver();
if (null != myNoisyAudioStreamReceiver) {
this.unregisterReceiver(myNoisyAudioStreamReceiver);
}
} catch (Exception e) {
Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
}
if (player != null) { if (player != null) {
player.release(); player.release();
player = null; player = null;
@ -152,6 +146,15 @@ public class VideoPlayerService extends Service {
super.onDestroy(); super.onDestroy();
} }
private void safeUnregisterReceiver()
{
try {
unregisterReceiver(myNoisyAudioStreamReceiver);
} catch (Exception e) {
Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
}
}
@Nullable @Nullable
@Override @Override
public IBinder onBind(Intent intent) { public IBinder onBind(Intent intent) {