@mcfarljw/capacitor-audio 1.0.0 → 1.0.2

package/{CapacitorAudio.podspec → McfarljwCapacitorAudio.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name = 'CapacitorAudio'
+  s.name = 'McfarljwCapacitorAudio'
   s.version = package['version']
   s.summary = package['description']
   s.license = package['license']

package/android/src/main/java/com/mcfarljw/capacitor/audio/CapacitorAudio.java

@@ -44,43 +44,47 @@ public class CapacitorAudio {
 
     public void play(String path, int track) {
         final Context context = this.context;
-        final String trimmedPath = path.replaceAll("^/+", "");
+        final String trimmedPath = path.trim().replaceAll("^/+", "");
         final String absolutePath = context.getFilesDir().getAbsolutePath() + "/files/" + trimmedPath;
         final String parsedPath = Uri.parse(absolutePath).getPath();
 
-
-        if (!audioTracks.containsKey(track)) {
-            audioTracks.put(track, new HashMap<>());
-        }
-
         this.bridge.getActivity().runOnUiThread(() -> {
-            if (audioTracks.get(track).containsKey(trimmedPath)) {
-                mSoundPool.play(audioTracks.get(track).get(trimmedPath), mSoundVolume, mSoundVolume, 1, 0, mSoundRate);
-            } else {
-                final File file = new File(parsedPath);
-                int soundId;
-
-                Log.d(PLUGIN_NAME, "playing file: " + file.getAbsolutePath());
+            if (!audioTracks.containsKey(track)) {
+                audioTracks.put(track, new HashMap<>());
+            }
 
-                if (file.exists()) {
-                    soundId = mSoundPool.load(file.getPath(), 1);
-                    audioTracks.get(track).put(trimmedPath, soundId);
+            try {
+                if (audioTracks.get(track).containsKey(trimmedPath)) {
+                    mSoundPool.play(audioTracks.get(track).get(trimmedPath), mSoundVolume, mSoundVolume, 1, 0, mSoundRate);
                 } else {
-                    try {
-                        soundId = mSoundPool.load(context.getAssets().openFd("public/" + trimmedPath), 1);
-                        audioTracks.get(track).put(trimmedPath, soundId);
-                    } catch (IOException error) {
-                        Log.i(PLUGIN_NAME, "public file not found: " + error.getMessage());
-                    }
+                    final File file = new File(parsedPath);
+                    int soundId;
 
-                    try {
-                        soundId = mSoundPool.load(context.getAssets().openFd("www/" + trimmedPath), 1);
+                    Log.d(PLUGIN_NAME, "playing file: " + file.getAbsolutePath());
+
+                    if (file.exists()) {
+                        soundId = mSoundPool.load(file.getPath(), 1);
                         audioTracks.get(track).put(trimmedPath, soundId);
-                    } catch (IOException error) {
-                        Log.d(PLUGIN_NAME, "www file not found: " + error.getMessage());
+                    } else {
+                        try {
+                            soundId = mSoundPool.load(context.getAssets().openFd("public/" + trimmedPath), 1);
+                            audioTracks.get(track).put(trimmedPath, soundId);
+                        } catch (IOException error) {
+                            Log.i(PLUGIN_NAME, "public file not found: " + error.getMessage());
+                        }
+
+                        try {
+                            soundId = mSoundPool.load(context.getAssets().openFd("www/" + trimmedPath), 1);
+                            audioTracks.get(track).put(trimmedPath, soundId);
+                        } catch (IOException error) {
+                            Log.d(PLUGIN_NAME, "www file not found: " + error.getMessage());
+                        }
                     }
                 }
+            } catch (NullPointerException error) {
+                Log.i(PLUGIN_NAME, "Unable to play audio!");
             }
+
         });
     }
 

package/android/src/main/java/com/mcfarljw/capacitor/audio/CapacitorAudioPlugin.java

@@ -1,5 +1,7 @@
 package com.mcfarljw.capacitor.audio;
 
+import androidx.annotation.NonNull;
+
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
@@ -20,7 +22,9 @@ public class CapacitorAudioPlugin extends Plugin {
         String path = call.getString("path");
         int track = call.getInt("track", 0);
 
-        implementation.play(path, track);
+        if (path != null) {
+            implementation.play(path, track);
+        }
 
         call.resolve();
     }

package/ios/Plugin/CapacitorAudio.swift

@@ -27,7 +27,7 @@ import Foundation
     }
     
     @objc public func play(_ path: String, _ track: Int) -> Void {
-        let trimmedPath = path.trimmingCharacters(in: .whitespaces)
+        let trimmedPath = path.trimmingCharacters(in: .whitespaces).trimmingCharacters(in: CharacterSet(charactersIn: "/"))
         let documentPath = "\(self.documentDirectory!)\(trimmedPath)"
         let wwwPath = "\(self.wwwDirectory!)\(trimmedPath)"
         let publicPath = "\(self.publicDirectory!)\(trimmedPath)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcfarljw/capacitor-audio",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "A native audio plugin for Ionic Capacitor.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -11,7 +11,7 @@
     "android/build.gradle",
     "dist/",
     "ios/Plugin/",
-    "CapacitorAudio.podspec"
+    "McfarljwCapacitorAudio.podspec"
   ],
   "author": "Joshua McFarland <mcfarljw@gmail.com>",
   "license": "MIT",