From 74a16e455f8984c0cc9a843f34467c6453ac1076 Mon Sep 17 00:00:00 2001
From: Dennis Stumm <ds695sas@gmail.com>
Date: Fri, 9 Aug 2024 18:34:28 +0200
Subject: [PATCH 1/3] Fixed error handling according to new
 MediaBrowserServiceCompat api

---
 .../audioservice/AudioServicePlugin.java      | 34 +++++++++++++++----
 audio_service/pubspec.yaml                    |  2 +-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
index b776a840..47e248c9 100644
--- a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
+++ b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
@@ -551,12 +551,13 @@ public void onLoadChildren(final String parentMediaId, final MediaBrowserService
                 audioHandlerInterface.invokeMethod("getChildren", args, new MethodChannel.Result() {
                     @Override
                     public void error(String errorCode, String errorMessage, Object errorDetails) {
-                        result.sendError(new Bundle());
+                        setErrorState(errorCode, errorMessage);
+                        result.sendResult(null);
                     }
 
                     @Override
                     public void notImplemented() {
-                        result.sendError(new Bundle());
+                        result.sendResult(null);
                     }
 
                     @Override
@@ -583,12 +584,13 @@ public void onLoadItem(String itemId, final MediaBrowserServiceCompat.Result<Med
                 audioHandlerInterface.invokeMethod("getMediaItem", args, new MethodChannel.Result() {
                     @Override
                     public void error(String errorCode, String errorMessage, Object errorDetails) {
-                        result.sendError(new Bundle());
+                        setErrorState(errorCode, errorMessage);
+                        result.sendResult(null);
                     }
 
                     @Override
                     public void notImplemented() {
-                        result.sendError(new Bundle());
+                        result.sendResult(null);
                     }
 
                     @Override
@@ -616,12 +618,13 @@ public void onSearch(String query, Bundle extras, final MediaBrowserServiceCompa
                 audioHandlerInterface.invokeMethod("search", args, new MethodChannel.Result() {
                     @Override
                     public void error(String errorCode, String errorMessage, Object errorDetails) {
-                        result.sendError(new Bundle());
+                        setErrorState(errorCode, errorMessage);
+                        result.sendResult(null);
                     }
 
                     @Override
                     public void notImplemented() {
-                        result.sendError(new Bundle());
+                        result.sendResult(null);
                     }
 
                     @Override
@@ -1019,6 +1022,25 @@ private void destroy() {
             if (silenceAudioTrack != null)
                 silenceAudioTrack.release();
         }
+
+        private void setErrorState(String errorCode, String errorMessage)  {
+            AudioService.instance.setState(
+                    new ArrayList<MediaControl>(),
+                    0,
+                    null,
+                    AudioProcessingState.error,
+                    false,
+                    0,
+                    0,
+                    0,
+                    0,
+                    Integer.parseInt(errorCode),
+                    errorMessage,
+                    0,
+                    0,
+                    false,
+                    0L);
+        }
     }
 
     private static List<Map<?, ?>> mediaItems2raw(List<MediaBrowserCompat.MediaItem> mediaItems) {
diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml
index 0e394a12..7dba64b1 100644
--- a/audio_service/pubspec.yaml
+++ b/audio_service/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.18.15
+version: 0.18.16
 repository: https://github.com/ryanheise/audio_service/tree/minor/audio_service
 issue_tracker: https://github.com/ryanheise/audio_service/issues
 topics:

From f654b658b711c3e7e152b1b3366ce15c0fbe5fdd Mon Sep 17 00:00:00 2001
From: Dennis Stumm <ds695sas@gmail.com>
Date: Fri, 9 Aug 2024 18:44:10 +0200
Subject: [PATCH 2/3] Updated CHANGELOG.md

---
 audio_service/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/audio_service/CHANGELOG.md b/audio_service/CHANGELOG.md
index ba3f1965..9538543f 100644
--- a/audio_service/CHANGELOG.md
+++ b/audio_service/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.18.16
+* Fix error handling in onLoadChildren, onLoadItem and onSearch (@dsst95)
+
 ## 0.18.15
 
 * Add deep link support for FlutterFragmentActivity (@jan-milovanovic).

From 6a521b238c2059b01d7a62f2efd0d5fbe38ce53b Mon Sep 17 00:00:00 2001
From: Dennis Stumm <6422711+dsst95@users.noreply.github.com>
Date: Thu, 15 Aug 2024 18:55:21 +0200
Subject: [PATCH 3/3] Fix bug on showing error message

---
 .../java/com/ryanheise/audioservice/AudioServicePlugin.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
index 47e248c9..1f49cea4 100644
--- a/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
+++ b/audio_service/android/src/main/java/com/ryanheise/audioservice/AudioServicePlugin.java
@@ -1039,7 +1039,7 @@ private void setErrorState(String errorCode, String errorMessage)  {
                     0,
                     0,
                     false,
-                    0L);
+                    null);
         }
     }