new-fork to merge branch

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.2
+
+* Bug fixes.
+
 ## 0.6.1
 
 * Option to stop service on closing task (Android).

android/src/main/java/com/ryanheise/audioservice/AudioService.java

@@ -480,6 +480,7 @@ public void onLoadChildren(final String parentMediaId, final Result<List<MediaBr
 
 	@Override
 	public int onStartCommand(final Intent intent, int flags, int startId) {
+		if (intent == null) { stopSelf(); }
 		MediaButtonReceiver.handleIntent(mediaSession, intent);
 		return super.onStartCommand(intent, flags, startId);
 	}

android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java

@@ -568,7 +568,7 @@ public void onAddQueueItem(MediaMetadataCompat metadata) {
 		}
 		@Override
 		public void onAddQueueItemAt(MediaMetadataCompat metadata, int index) {
-			invokeMethod("onAddQueueItem", mediaMetadata2raw(metadata), index);
+			invokeMethod("onAddQueueItemAt", mediaMetadata2raw(metadata), index);
 		}
 		@Override
 		public void onRemoveQueueItem(MediaMetadataCompat metadata) {

lib/audio_service.dart

@@ -79,7 +79,10 @@ class PlaybackState {
   /// The current playback position in milliseconds
   int get currentPosition {
     if (basicState == BasicPlaybackState.playing) {
-      return position + DateTime.now().millisecondsSinceEpoch - updateTime;
+      return (position +
+              ((DateTime.now().millisecondsSinceEpoch - updateTime) *
+                  (speed ?? 1.0)))
+          .toInt();
     } else {
       return position;
     }
@@ -372,6 +375,9 @@ class AudioService {
 
   static final _browseMediaChildrenSubject = BehaviorSubject<List<MediaItem>>();
 
+  /// An instance of flutter isolate
+  static FlutterIsolate _flutterIsolate;
+
   /// A stream that broadcasts the children of the current browse
   /// media parent.
   static Stream<List<MediaItem>> get browseMediaChildrenStream =>
@@ -439,11 +445,15 @@ class AudioService {
           _playbackStateSubject.add(_playbackState);
           break;
         case 'onMediaChanged':
-          _currentMediaItem = call.arguments[0] != null ? _raw2mediaItem(call.arguments[0]) : null;
+          _currentMediaItem = call.arguments[0] != null
+              ? _raw2mediaItem(call.arguments[0])
+              : null;
           _currentMediaItemSubject.add(_currentMediaItem);
           break;
         case 'onQueueChanged':
-          final List<Map> args = call.arguments[0] != null ? List<Map>.from(call.arguments[0]) : null;
+          final List<Map> args = call.arguments[0] != null
+              ? List<Map>.from(call.arguments[0])
+              : null;
           _queue = args?.map(_raw2mediaItem)?.toList();
           _queueSubject.add(_queue);
           break;
@@ -531,7 +541,7 @@ class AudioService {
       // TODO: remove dependency on flutter_isolate by either using the
       // FlutterNativeView API directly or by waiting until Flutter allows
       // regular isolates to use method channels.
-      await FlutterIsolate.spawn(_iosIsolateEntrypoint, callbackHandle);
+      AudioService._flutterIsolate = await FlutterIsolate.spawn(_iosIsolateEntrypoint, callbackHandle);
     }
     return await _channel.invokeMethod('start', {
       'callbackHandle': callbackHandle,
@@ -816,7 +826,7 @@ class AudioServiceBackground {
     await task.onStart();
     await _backgroundChannel.invokeMethod('stopped');
     if (Platform.isIOS) {
-      FlutterIsolate.current.kill();
+      AudioService._flutterIsolate?.kill();
     }
     _backgroundChannel.setMethodCallHandler(null);
     _state = _noneState;
@@ -865,7 +875,8 @@ class AudioServiceBackground {
               'action': control.action.index,
             })
         .toList();
-    final rawSystemActions = systemActions.map((action) => action.index).toList();
+    final rawSystemActions =
+        systemActions.map((action) => action.index).toList();
     await _backgroundChannel.invokeMethod('setState', [
       rawControls,
       rawSystemActions,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: audio_service
 description: Flutter plugin to play audio in the background while the screen is off.
-version: 0.6.1
+version: 0.6.2
 homepage: https://github.com/ryanheise/audio_service
 
 environment: