Merge pull request #135 from sgilroy/android-remote-complete

Fix "complete" event not dispatched on Android
Cap-go · Oct 29, 2024 · cd3afdf · cd3afdf
2 parents f4a74b6 + 2363425
commit cd3afdf
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -252,7 +252,7 @@ Load an audio file
 ### isPreloaded(...)
 
 ```typescript
-isPreloaded(options: PreloadOptions) => Promise<boolean>
+isPreloaded(options: PreloadOptions) => Promise<{ found: boolean; }>
 ```
 
 Check if an audio file is preloaded
@@ -261,7 +261,7 @@ Check if an audio file is preloaded
 | ------------- | --------------------------------------------------------- |
 | **`options`** | <code><a href="#preloadoptions">PreloadOptions</a></code> |
 
-**Returns:** <code>Promise&lt;boolean&gt;</code>
+**Returns:** <code>Promise&lt;{ found: boolean; }&gt;</code>
 
 **Since:** 6.1.0
 

diff --git a/android/src/main/java/ee/forgr/audio/AudioAsset.java b/android/src/main/java/ee/forgr/audio/AudioAsset.java
@@ -13,6 +13,7 @@ public class AudioAsset {
   private int playIndex = 0;
   private final String assetId;
   protected final NativeAudio owner;
+  protected AudioCompletionListener completionListener;
 
   AudioAsset(
     NativeAudio owner,
@@ -167,4 +168,14 @@ public boolean isPlaying() throws Exception {
 
     return audioList.get(playIndex).isPlaying();
   }
+
+  public void setCompletionListener(AudioCompletionListener listener) {
+    this.completionListener = listener;
+  }
+
+  protected void notifyCompletion() {
+    if (completionListener != null) {
+      completionListener.onCompletion(this.assetId);
+    }
+  }
 }
diff --git a/android/src/main/java/ee/forgr/audio/AudioCompletionListener.java b/android/src/main/java/ee/forgr/audio/AudioCompletionListener.java
@@ -0,0 +1,5 @@
+package ee.forgr.audio;
+
+public interface AudioCompletionListener {
+  void onCompletion(String assetId);
+}
diff --git a/android/src/main/java/ee/forgr/audio/AudioDispatcher.java b/android/src/main/java/ee/forgr/audio/AudioDispatcher.java
@@ -118,7 +118,7 @@ public void onCompletion(MediaPlayer mp) {
         this.stop();
 
         if (this.owner != null) {
-          this.owner.dispatchComplete();
+          this.owner.notifyCompletion();
         }
       }
     } catch (Exception ex) {

diff --git a/android/src/main/java/ee/forgr/audio/NativeAudio.java b/android/src/main/java/ee/forgr/audio/NativeAudio.java
@@ -504,6 +504,7 @@ private void preloadAsset(PluginCall call) {
               audioChannelNum,
               volume
             );
+            remoteAudioAsset.setCompletionListener(this::dispatchComplete);
             audioAssetList.put(audioId, remoteAudioAsset);
           } else if (
             uri.getScheme() != null && uri.getScheme().equals("file")
@@ -535,6 +536,7 @@ private void preloadAsset(PluginCall call) {
               audioChannelNum,
               volume
             );
+            asset.setCompletionListener(this::dispatchComplete);
             audioAssetList.put(audioId, asset);
           } else {
             throw new IllegalArgumentException(

diff --git a/android/src/main/java/ee/forgr/audio/RemoteAudioAsset.java b/android/src/main/java/ee/forgr/audio/RemoteAudioAsset.java
@@ -45,6 +45,9 @@ private void initializeMediaPlayer(MediaPlayer mediaPlayer) {
         isPrepared = true;
         Log.d(TAG, "MediaPlayer prepared for " + uri.toString());
       });
+      mediaPlayer.setOnCompletionListener(mp -> {
+        notifyCompletion();
+      });
       mediaPlayer.setOnErrorListener((mp, what, extra) -> {
         Log.e(TAG, "MediaPlayer error: " + what + ", " + extra);
         return false;