@independo/capacitor-voice-recorder 8.1.0-dev.3 → 8.1.0

package/android/build.gradle

@@ -67,6 +67,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     testImplementation "org.json:json:20240303"
+    testImplementation "org.mockito:mockito-core:5.21.0"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
 }

package/android/src/main/java/app/independo/capacitorvoicerecorder/platform/CustomMediaRecorder.java

@@ -18,10 +18,109 @@ import java.util.regex.Pattern;
 /** MediaRecorder wrapper that manages audio focus and interruptions. */
 public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListener, RecorderAdapter {
 
+    interface MediaRecorderFactory {
+        MediaRecorder create();
+    }
+
+    interface AudioManagerProvider {
+        AudioManager getAudioManager(Context context);
+    }
+
+    interface DirectoryProvider {
+        File getDocumentsDirectory();
+
+        File getFilesDir(Context context);
+
+        File getCacheDir(Context context);
+
+        File getExternalFilesDir(Context context);
+
+        File getExternalStorageDirectory();
+    }
+
+    interface SdkIntProvider {
+        int getSdkInt();
+    }
+
+    interface AudioFocusRequestFactory {
+        AudioFocusRequest create(AudioManager.OnAudioFocusChangeListener listener);
+    }
+
+    private static final class DefaultMediaRecorderFactory implements MediaRecorderFactory {
+        @Override
+        public MediaRecorder create() {
+            return new MediaRecorder();
+        }
+    }
+
+    private static final class DefaultAudioManagerProvider implements AudioManagerProvider {
+        @Override
+        public AudioManager getAudioManager(Context context) {
+            return (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        }
+    }
+
+    private static final class DefaultDirectoryProvider implements DirectoryProvider {
+        @Override
+        public File getDocumentsDirectory() {
+            return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
+        }
+
+        @Override
+        public File getFilesDir(Context context) {
+            return context.getFilesDir();
+        }
+
+        @Override
+        public File getCacheDir(Context context) {
+            return context.getCacheDir();
+        }
+
+        @Override
+        public File getExternalFilesDir(Context context) {
+            return context.getExternalFilesDir(null);
+        }
+
+        @Override
+        public File getExternalStorageDirectory() {
+            return Environment.getExternalStorageDirectory();
+        }
+    }
+
+    private static final class DefaultSdkIntProvider implements SdkIntProvider {
+        @Override
+        public int getSdkInt() {
+            return Build.VERSION.SDK_INT;
+        }
+    }
+
+    private static final class DefaultAudioFocusRequestFactory implements AudioFocusRequestFactory {
+        @Override
+        public AudioFocusRequest create(AudioManager.OnAudioFocusChangeListener listener) {
+            AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_MEDIA)
+                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                .build();
+
+            return new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                .setAudioAttributes(audioAttributes)
+                .setOnAudioFocusChangeListener(listener)
+                .build();
+        }
+    }
+
     /** Android context for file paths and system services. */
     private final Context context;
     /** Recording options passed from the service layer. */
     private final RecordOptions options;
+    /** Factory for MediaRecorder instances. */
+    private final MediaRecorderFactory mediaRecorderFactory;
+    /** Directory provider for file output. */
+    private final DirectoryProvider directoryProvider;
+    /** SDK version provider for API gating. */
+    private final SdkIntProvider sdkIntProvider;
+    /** Audio focus request factory for O and above. */
+    private final AudioFocusRequestFactory audioFocusRequestFactory;
     /** Active MediaRecorder instance for the session. */
     private MediaRecorder mediaRecorder;
     /** Output file for the current recording session. */
@@ -38,9 +137,33 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
     private Runnable onInterruptionEnded;
 
     public CustomMediaRecorder(Context context, RecordOptions options) throws IOException {
+        this(
+            context,
+            options,
+            new DefaultMediaRecorderFactory(),
+            new DefaultAudioManagerProvider(),
+            new DefaultDirectoryProvider(),
+            new DefaultSdkIntProvider(),
+            new DefaultAudioFocusRequestFactory()
+        );
+    }
+
+    CustomMediaRecorder(
+        Context context,
+        RecordOptions options,
+        MediaRecorderFactory mediaRecorderFactory,
+        AudioManagerProvider audioManagerProvider,
+        DirectoryProvider directoryProvider,
+        SdkIntProvider sdkIntProvider,
+        AudioFocusRequestFactory audioFocusRequestFactory
+    ) throws IOException {
         this.context = context;
         this.options = options;
-        this.audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        this.mediaRecorderFactory = mediaRecorderFactory;
+        this.directoryProvider = directoryProvider;
+        this.sdkIntProvider = sdkIntProvider;
+        this.audioFocusRequestFactory = audioFocusRequestFactory;
+        this.audioManager = audioManagerProvider.getAudioManager(context);
         generateMediaRecorder();
     }
 
@@ -56,7 +179,7 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
 
     /** Configures the MediaRecorder with audio settings. */
     private void generateMediaRecorder() throws IOException {
-        mediaRecorder = new MediaRecorder();
+        mediaRecorder = mediaRecorderFactory.create();
         mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
         mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.AAC_ADTS);
         mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
@@ -68,7 +191,7 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
 
     /** Picks a directory and allocates the output file for this session. */
     private void setRecorderOutputFile() throws IOException {
-        File outputDir = context.getCacheDir();
+        File outputDir = directoryProvider.getCacheDir(context);
 
         String directory = options.directory();
         String subDirectory = options.subDirectory();
@@ -99,11 +222,11 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
     /** Maps directory strings to Android file locations. */
     private File getDirectory(String directory) {
         return switch (directory) {
-            case "DOCUMENTS" -> Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
-            case "DATA", "LIBRARY" -> context.getFilesDir();
-            case "CACHE" -> context.getCacheDir();
-            case "EXTERNAL" -> context.getExternalFilesDir(null);
-            case "EXTERNAL_STORAGE" -> Environment.getExternalStorageDirectory();
+            case "DOCUMENTS" -> directoryProvider.getDocumentsDirectory();
+            case "DATA", "LIBRARY" -> directoryProvider.getFilesDir(context);
+            case "CACHE" -> directoryProvider.getCacheDir(context);
+            case "EXTERNAL" -> directoryProvider.getExternalFilesDir(context);
+            case "EXTERNAL_STORAGE" -> directoryProvider.getExternalStorageDirectory();
             default -> null;
         };
     }
@@ -150,7 +273,7 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
 
     /** Pauses recording when supported by the OS version. */
     public boolean pauseRecording() throws NotSupportedOsVersion {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+        if (sdkIntProvider.getSdkInt() < Build.VERSION_CODES.N) {
             throw new NotSupportedOsVersion();
         }
 
@@ -165,7 +288,7 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
 
     /** Resumes a paused or interrupted recording session. */
     public boolean resumeRecording() throws NotSupportedOsVersion {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+        if (sdkIntProvider.getSdkInt() < Build.VERSION_CODES.N) {
             throw new NotSupportedOsVersion();
         }
 
@@ -215,17 +338,8 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
             return;
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AudioAttributes audioAttributes = new AudioAttributes.Builder()
-                .setUsage(AudioAttributes.USAGE_MEDIA)
-                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                .build();
-
-            audioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-                .setAudioAttributes(audioAttributes)
-                .setOnAudioFocusChangeListener(this)
-                .build();
-
+        if (sdkIntProvider.getSdkInt() >= Build.VERSION_CODES.O) {
+            audioFocusRequest = audioFocusRequestFactory.create(this);
             audioManager.requestAudioFocus(audioFocusRequest);
         } else {
             audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
@@ -238,7 +352,7 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
             return;
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && audioFocusRequest != null) {
+        if (sdkIntProvider.getSdkInt() >= Build.VERSION_CODES.O && audioFocusRequest != null) {
             audioManager.abandonAudioFocusRequest(audioFocusRequest);
             audioFocusRequest = null;
         } else {
@@ -256,7 +370,7 @@ public class CustomMediaRecorder implements AudioManager.OnAudioFocusChangeListe
                 // For voice recording, ducking still degrades captured audio, so treat all loss types as interruptions.
                 if (currentRecordingStatus == CurrentRecordingStatus.RECORDING) {
                     try {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                        if (sdkIntProvider.getSdkInt() >= Build.VERSION_CODES.N) {
                             mediaRecorder.pause();
                             currentRecordingStatus = CurrentRecordingStatus.INTERRUPTED;
                             if (onInterruptionBegan != null) {

package/android/src/main/java/app/independo/capacitorvoicerecorder/platform/DefaultRecorderPlatform.java

@@ -17,11 +17,77 @@ import java.io.IOException;
 /** Default Android platform adapter for recording and file IO. */
 public class DefaultRecorderPlatform implements RecorderPlatform {
 
+    interface RecorderFactory {
+        RecorderAdapter create(Context context, RecordOptions options) throws Exception;
+    }
+
+    interface MediaPlayerFactory {
+        MediaPlayer create();
+    }
+
+    interface UriConverter {
+        String toUri(File recordedFile);
+    }
+
+    interface Base64Encoder {
+        String encode(byte[] data);
+    }
+
+    private static final class DefaultRecorderFactory implements RecorderFactory {
+        @Override
+        public RecorderAdapter create(Context context, RecordOptions options) throws Exception {
+            return new CustomMediaRecorder(context, options);
+        }
+    }
+
+    private static final class DefaultMediaPlayerFactory implements MediaPlayerFactory {
+        @Override
+        public MediaPlayer create() {
+            return new MediaPlayer();
+        }
+    }
+
+    private static final class DefaultUriConverter implements UriConverter {
+        @Override
+        public String toUri(File recordedFile) {
+            return Uri.fromFile(recordedFile).toString();
+        }
+    }
+
+    private static final class DefaultBase64Encoder implements Base64Encoder {
+        @Override
+        public String encode(byte[] data) {
+            return Base64.encodeToString(data, Base64.DEFAULT);
+        }
+    }
+
     /** Android context used to access system services. */
     private final Context context;
+    /** Recorder factory for platform creation. */
+    private final RecorderFactory recorderFactory;
+    /** Media player factory for duration lookup. */
+    private final MediaPlayerFactory mediaPlayerFactory;
+    /** Uri converter for response payloads. */
+    private final UriConverter uriConverter;
+    /** Base64 encoder for file payloads. */
+    private final Base64Encoder base64Encoder;
 
     public DefaultRecorderPlatform(Context context) {
+        this(context, new DefaultRecorderFactory(), new DefaultMediaPlayerFactory(), new DefaultUriConverter(), new DefaultBase64Encoder());
+    }
+
+    DefaultRecorderPlatform(
+        Context context,
+        RecorderFactory recorderFactory,
+        MediaPlayerFactory mediaPlayerFactory,
+        UriConverter uriConverter,
+        Base64Encoder base64Encoder
+    ) {
         this.context = context;
+        this.recorderFactory = recorderFactory;
+        this.mediaPlayerFactory = mediaPlayerFactory;
+        this.uriConverter = uriConverter;
+        this.base64Encoder = base64Encoder;
     }
 
     /** Returns whether the device can create a MediaRecorder instance. */
@@ -41,7 +107,7 @@ public class DefaultRecorderPlatform implements RecorderPlatform {
     /** Creates the recorder adapter for the provided options. */
     @Override
     public RecorderAdapter createRecorder(RecordOptions options) throws Exception {
-        return new CustomMediaRecorder(context, options);
+        return recorderFactory.create(context, options);
     }
 
     /** Reads the recorded file as base64, returning null on failure. */
@@ -54,7 +120,7 @@ public class DefaultRecorderPlatform implements RecorderPlatform {
             while ((bytesRead = bufferedInputStream.read(buffer)) != -1) {
                 outputStream.write(buffer, 0, bytesRead);
             }
-            return Base64.encodeToString(outputStream.toByteArray(), Base64.DEFAULT);
+            return base64Encoder.encode(outputStream.toByteArray());
         } catch (IOException exp) {
             return null;
         }
@@ -65,7 +131,7 @@ public class DefaultRecorderPlatform implements RecorderPlatform {
     public int getDurationMs(File recordedFile) {
         MediaPlayer mediaPlayer = null;
         try {
-            mediaPlayer = new MediaPlayer();
+            mediaPlayer = mediaPlayerFactory.create();
             mediaPlayer.setDataSource(recordedFile.getAbsolutePath());
             mediaPlayer.prepare();
             return mediaPlayer.getDuration();
@@ -81,6 +147,6 @@ public class DefaultRecorderPlatform implements RecorderPlatform {
     /** Returns a file:// URI for the given recording. */
     @Override
     public String toUri(File recordedFile) {
-        return Uri.fromFile(recordedFile).toString();
+        return uriConverter.toUri(recordedFile);
     }
 }

package/ios/Sources/VoiceRecorder/Bridge/VoiceRecorder.swift

@@ -2,6 +2,9 @@ import Foundation
 import AVFoundation
 import Capacitor
 
+typealias PermissionRequester = (@escaping (Bool) -> Void) -> Void
+typealias PermissionStatusProvider = () -> AVAudioSession.RecordPermission
+
 /// Capacitor bridge for the VoiceRecorder plugin.
 @objc(VoiceRecorder)
 public class VoiceRecorder: CAPPlugin, CAPBridgedPlugin {
@@ -25,6 +28,14 @@ public class VoiceRecorder: CAPPlugin, CAPBridgedPlugin {
     private var service: VoiceRecorderService?
     /// Response format derived from plugin configuration.
     private var responseFormat: ResponseFormat = .legacy
+    /// Permission requester used by the bridge.
+    private var permissionRequester: PermissionRequester = { completion in
+        AVAudioSession.sharedInstance().requestRecordPermission(completion)
+    }
+    /// Permission status provider used by the bridge.
+    private var permissionStatusProvider: PermissionStatusProvider = {
+        AVAudioSession.sharedInstance().recordPermission
+    }
 
     /// Initializes dependencies after the plugin loads.
     public override func load() {
@@ -38,6 +49,24 @@ public class VoiceRecorder: CAPPlugin, CAPBridgedPlugin {
         )
     }
 
+    func configureForTesting(
+        service: VoiceRecorderService?,
+        responseFormat: ResponseFormat? = nil,
+        permissionRequester: PermissionRequester? = nil,
+        permissionStatusProvider: PermissionStatusProvider? = nil
+    ) {
+        self.service = service
+        if let responseFormat = responseFormat {
+            self.responseFormat = responseFormat
+        }
+        if let permissionRequester = permissionRequester {
+            self.permissionRequester = permissionRequester
+        }
+        if let permissionStatusProvider = permissionStatusProvider {
+            self.permissionStatusProvider = permissionStatusProvider
+        }
+    }
+
     /// Returns whether the device can record audio.
     @objc func canDeviceVoiceRecord(_ call: CAPPluginCall) {
         let canRecord = service?.canDeviceVoiceRecord() ?? false
@@ -46,7 +75,7 @@ public class VoiceRecorder: CAPPlugin, CAPBridgedPlugin {
 
     /// Requests microphone permission from the user.
     @objc func requestAudioRecordingPermission(_ call: CAPPluginCall) {
-        AVAudioSession.sharedInstance().requestRecordPermission { granted in
+        permissionRequester { granted in
             if granted {
                 call.resolve(ResponseGenerator.successResponse())
             } else {
@@ -159,7 +188,7 @@ public class VoiceRecorder: CAPPlugin, CAPBridgedPlugin {
 
     /// Returns whether AVAudioSession reports granted permission.
     func doesUserGaveAudioRecordingPermission() -> Bool {
-        return AVAudioSession.sharedInstance().recordPermission == AVAudioSession.RecordPermission.granted
+        return permissionStatusProvider() == AVAudioSession.RecordPermission.granted
     }
 
     /// Maps canonical error codes back to legacy messages.

package/package.json

@@ -13,7 +13,7 @@
     "url": "https://github.com/independo-gmbh/capacitor-voice-recorder.git"
   },
   "description": "Capacitor plugin for voice recording",
-  "version": "8.1.0-dev.3",
+  "version": "8.1.0",
   "devDependencies": {
     "@capacitor/android": "^8.0.0",
     "conventional-changelog-conventionalcommits": "^9.1.0",