Merge branch 'health13/prs' into 1139-single-record-ios

Author: iarata

packages/audio_streamer/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 4.3.0
+
+* Fix issue where stream function made a new thread each time a recording starts - Fixes [#1242](https://github.com/cph-cachet/flutter-plugins/issues/1242)
+* Updated Gradle and Kotlin
+* Updated `permission_handler: ^12.0.0`
+* Updated `sdk >=3.8.1`
+
 ## 4.2.2
 
 * Reverts [#1226](https://github.com/cph-cachet/flutter-plugins/pull/1226)

packages/audio_streamer/android/build.gradle

@@ -2,14 +2,14 @@ group 'plugins.cachet.audio_streamer'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.9.22'
+    ext.kotlin_version = '2.2.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.12.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

packages/audio_streamer/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

packages/audio_streamer/android/settings.gradle

@@ -20,8 +20,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.2"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.20" apply false
+    id "com.android.application" version "8.12.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.10" apply false
 }
 
 include ":app"

packages/audio_streamer/android/src/main/kotlin/plugins/cachet/audio_streamer/AudioStreamerPlugin.kt

@@ -34,7 +34,9 @@ class AudioStreamerPlugin : FlutterPlugin, RequestPermissionsResultListener, Eve
 
     // / Variables (i.e. will change value)
     private var eventSink: EventSink? = null
-    private var recording = false
+    @Volatile private var recording = false
+    private var recordingThread: Thread? = null
+
 
     private var currentActivity: Activity? = null
 
@@ -48,16 +50,19 @@ class AudioStreamerPlugin : FlutterPlugin, RequestPermissionsResultListener, Eve
         methodChannel.setMethodCallHandler {
                 call, result ->
             if (call.method == "getSampleRate") {
-                // Sample rate never changes, so return the given sample rate.
-                result.success(audioRecord?.getSampleRate())
+                if (::audioRecord.isInitialized) {
+                    result.success(audioRecord.sampleRate)
+                } else {
+                    result.error("UNAVAILABLE", "AudioRecord not initialized.", null)
+                }
             } else {
                 result.notImplemented()
             }
         }
     }
 
     override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
-        recording = false
+        stopRecording()
     }
 
     override fun onDetachedFromActivity() {
@@ -83,20 +88,19 @@ class AudioStreamerPlugin : FlutterPlugin, RequestPermissionsResultListener, Eve
      */
     override fun onListen(arguments: Any?, events: EventSink?) {
         this.eventSink = events
-        recording = true
         sampleRate = (arguments as Map<*, *>)["sampleRate"] as Int
         if (sampleRate < 4000 || sampleRate > 48000) {
             events!!.error("SampleRateError", "A sample rate of " + sampleRate + "Hz is not supported by Android.", null)
             return
         }
-        streamMicData()
+        startRecording()
     }
 
     /**
      * Called from Flutter, which cancels the stream.
      */
     override fun onCancel(arguments: Any?) {
-        recording = false
+        stopRecording()
     }
 
     /**
@@ -105,11 +109,36 @@ class AudioStreamerPlugin : FlutterPlugin, RequestPermissionsResultListener, Eve
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray): Boolean {
         val requestAudioPermissionCode = 200
         when (requestCode) {
-            requestAudioPermissionCode -> if (grantResults[0] == PackageManager.PERMISSION_GRANTED) return true
+            requestAudioPermissionCode -> if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) return true
         }
         return false
     }
 
+    private fun startRecording() {
+        if (recording) {
+            Log.w(logTag, "Recording is already in progress")
+            return
+        }
+        recording = true
+        recordingThread = Thread { streamMicData() }
+        recordingThread?.start()
+    }
+
+    private fun stopRecording() {
+        if (!recording) {
+            Log.w(logTag, "Recording is not in progress")
+            return
+        }
+        recording = false
+        try {
+            recordingThread?.join()
+        } catch (e: InterruptedException) {
+            e.printStackTrace()
+        }
+        recordingThread = null
+    }
+
+
     /**
      * Starts recording and streaming audio data from the mic.
      * Uses a buffer array of size 512. Whenever buffer is full, the content is sent to Flutter.
@@ -119,39 +148,51 @@ class AudioStreamerPlugin : FlutterPlugin, RequestPermissionsResultListener, Eve
      * https://www.newventuresoftware.com/blog/record-play-and-visualize-raw-audio-data-in-android
      */
     private fun streamMicData() {
-        Thread(
-            Runnable {
-                Process.setThreadPriority(Process.THREAD_PRIORITY_AUDIO)
-                val audioBuffer = ShortArray(bufferSize / 2)
-                audioRecord = AudioRecord(
-                    MediaRecorder.AudioSource.DEFAULT,
-                    sampleRate,
-                    AudioFormat.CHANNEL_IN_MONO,
-                    AudioFormat.ENCODING_PCM_16BIT,
-                    bufferSize,
-                )
-                if (audioRecord.state != AudioRecord.STATE_INITIALIZED) {
-                    Log.e(logTag, "Audio Record can't initialize!")
-                    return@Runnable
-                }
-                /** Start recording loop  */
-                audioRecord.startRecording()
-                while (recording) {
-                    /** Read data into buffer  */
-                    audioRecord.read(audioBuffer, 0, audioBuffer.size)
+        Process.setThreadPriority(Process.THREAD_PRIORITY_AUDIO)
+
+        val audioBuffer = ShortArray(bufferSize / 2)
+        try {
+            audioRecord = AudioRecord(
+                MediaRecorder.AudioSource.DEFAULT,
+                sampleRate,
+                AudioFormat.CHANNEL_IN_MONO,
+                AudioFormat.ENCODING_PCM_16BIT,
+                bufferSize,
+            )
+
+            if (audioRecord.state != AudioRecord.STATE_INITIALIZED) {
+                Log.e(logTag, "Audio Record can't initialize!")
+                eventSink?.error("MIC_ERROR", "Audio Record can't initialize!", null)
+                recording = false
+                return
+            }
+
+            audioRecord.startRecording()
+
+            while (recording) {
+                val readSize = audioRecord.read(audioBuffer, 0, audioBuffer.size)
+                if(readSize > 0) {
+                    val audioBufferList = ArrayList<Double>()
+                    for (i in 0 until readSize) {
+                        val normalizedImpulse = audioBuffer[i].toDouble() / maxAmplitude.toDouble()
+                        audioBufferList.add(normalizedImpulse)
+                    }
                     Handler(Looper.getMainLooper()).post {
-                        // / Convert to list in order to send via EventChannel.
-                        val audioBufferList = ArrayList<Double>()
-                        for (impulse in audioBuffer) {
-                            val normalizedImpulse = impulse.toDouble() / maxAmplitude.toDouble()
-                            audioBufferList.add(normalizedImpulse)
-                        }
-                        eventSink!!.success(audioBufferList)
+                        eventSink?.success(audioBufferList)
                     }
                 }
-                audioRecord.stop()
+            }
+        } catch (e: Exception) {
+            Log.e(logTag, "Error while recording audio", e)
+            eventSink?.error("MIC_ERROR", "Error while recording audio", e.message)
+        } finally {
+            if (::audioRecord.isInitialized) {
+                if (audioRecord.recordingState == AudioRecord.RECORDSTATE_RECORDING) {
+                    audioRecord.stop()
+                }
                 audioRecord.release()
-            },
-        ).start()
+            }
+            recording = false
+        }
     }
-}
+}

packages/audio_streamer/example/android/gradle.properties

@@ -1,8 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 

packages/audio_streamer/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Mar 12 17:19:03 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

packages/audio_streamer/example/android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.2"
-    id "com.android.application" version "8.1.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.20" apply false
+    id "com.android.application" version '8.12.1' apply false
+    id "org.jetbrains.kotlin.android" version "2.2.10" apply false
 }
 
 include ":app"

packages/audio_streamer/example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

packages/audio_streamer/example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+# platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'