Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Keep lockscreen, notification and headset controls working after an episode auto-advances

Barnabas92535d2a659e
diff --git a/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioService.java b/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioService.java
index 9201e57d..eb0129f7 100644
--- a/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioService.java
+++ b/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioService.java
@@ -305,6 +305,13 @@ public class AudioService extends MediaBrowserServiceCompat {
public void onCreate() {
super.onCreate();
instance = this;
+ // Absorb patch: if this is a recreated service (a previous instance's
+ // onDestroy nulled the listener), re-register the existing handler so
+ // media buttons keep routing to Dart instead of being dropped in
+ // MediaSessionCallback.
+ if (listener == null) {
+ AudioServicePlugin.restoreServiceListener();
+ }
repeatMode = 0;
shuffleMode = 0;
notificationCreated = false;
diff --git a/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java b/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
index c38ee2e3..16c1d5cf 100644
--- a/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
+++ b/packages/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
@@ -148,6 +148,17 @@ public class AudioServicePlugin implements FlutterPlugin, ActivityAware {
return audioHandlerInterface;
}
+ // Absorb patch: re-register the handler as the service listener after the
+ // service is recreated. AudioService.onDestroy nulls the static listener,
+ // and nothing upstream ever sets it again (init only runs on engine
+ // attach), so a recreated service silently dropped every media button
+ // event in MediaSessionCallback while audio kept playing in-process.
+ static void restoreServiceListener() {
+ if (audioHandlerInterface != null) {
+ AudioService.init(audioHandlerInterface);
+ }
+ }
+
private static MediaBrowserCompat mediaBrowser;
private static MediaControllerCompat mediaController;
private static final MediaControllerCompat.Callback controllerCallback = new MediaControllerCompat.Callback() {
@@ -929,22 +940,27 @@ public class AudioServicePlugin implements FlutterPlugin, ActivityAware {
for (int i = 0; i < compactActionIndices.length; i++)
compactActionIndices[i] = (Integer)compactActionIndexList.get(i);
}
- AudioService.instance.setState(
- actions,
- actionBits,
- compactActionIndices,
- processingState,
- playing,
- position,
- bufferedPosition,
- speed,
- updateTimeSinceBoot,
- errorCode,
- errorMessage,
- repeatMode,
- shuffleMode,
- captioningEnabled,
- queueIndex);
+ // Absorb patch: null-guard so a state push after the
+ // service was destroyed doesn't NPE into the channel's
+ // error handler.
+ if (AudioService.instance != null) {
+ AudioService.instance.setState(
+ actions,
+ actionBits,
+ compactActionIndices,
+ processingState,
+ playing,
+ position,
+ bufferedPosition,
+ speed,
+ updateTimeSinceBoot,
+ errorCode,
+ errorMessage,
+ repeatMode,
+ shuffleMode,
+ captioningEnabled,
+ queueIndex);
+ }
result.success(null);
break;
}
diff --git a/packages/audio_service/lib/audio_service.dart b/packages/audio_service/lib/audio_service.dart
index 3104d7be..d26a0693 100644
--- a/packages/audio_service/lib/audio_service.dart
+++ b/packages/audio_service/lib/audio_service.dart
@@ -1129,7 +1129,16 @@ class AudioService {
try {
await _platform
.setState(SetStateRequest(state: playbackState._toMessage()));
- if (playbackState.processingState == AudioProcessingState.idle &&
+ // Absorb patch: on Android, never auto-stop the service when the
+ // state goes idle. just_audio emits idle from player.stop() during
+ // episode auto-advance, and this stopService call deactivated the
+ // MediaSession (Android 16 never re-routes media buttons to a
+ // reactivated session) or destroyed the service outright when the
+ // activity was unbound, leaving lock screen / notification / headset
+ // controls dead. The app's AudioHandler.stop() override deliberately
+ // keeps the session alive; this framework auto-stop bypassed it.
+ if (defaultTargetPlatform != TargetPlatform.android &&
+ playbackState.processingState == AudioProcessingState.idle &&
previousState?.processingState != AudioProcessingState.idle) {
await AudioService._stop();
}