@capgo/capacitor-screen-recorder 8.3.16 → 8.3.17

package/android/build.gradle

@@ -69,6 +69,5 @@ dependencies {
     implementation "androidx.core:core-ktx:$androidxCoreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation ("dev.bmcreations:scrcast:0.3.0")
-    implementation "com.karumi:dexter:6.2.3"
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0"
 }

package/android/src/main/java/ee/forgr/plugin/screenrecorder/CapgoScrCast.kt

@@ -7,18 +7,16 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
+import android.content.pm.PackageManager
 import android.media.MediaScannerConnection
 import android.os.IBinder
 import android.util.DisplayMetrics
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.karumi.dexter.Dexter
-import com.karumi.dexter.MultiplePermissionsReport
-import com.karumi.dexter.PermissionToken
-import com.karumi.dexter.listener.PermissionRequest
-import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import dev.bmcreations.scrcast.config.Options
 import dev.bmcreations.scrcast.internal.recorder.Action
 import dev.bmcreations.scrcast.internal.recorder.EXTRA_ERROR
@@ -74,30 +72,28 @@ class CapgoScrCast private constructor(
                     startListener = null
                 }
                 STATE_IDLE -> {
+                    val startPending = startListener != null
                     val error = intent.getSerializableExtra(EXTRA_ERROR) as? Throwable
                     if (error != null) {
                         startListener?.onFailed(error)
+                    } else if (startPending) {
+                        startListener?.onFailed(
+                            IllegalStateException("Recording stopped before it started"),
+                        )
                     }
-                    cleanupSession()
+                    cleanupSession(deleteEmptyOutput = startPending || error != null)
                 }
             }
         }
     }
 
-    private val permissionListener = object : MultiplePermissionsListener {
-        override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
-            if (report?.areAllPermissionsGranted() == true) {
-                startProjection.launch(Unit)
-            } else {
-                notifyStartFailed(SecurityException("Required permissions were not granted"))
-            }
-        }
-
-        override fun onPermissionRationaleShouldBeShown(
-            permissions: MutableList<PermissionRequest>?,
-            token: PermissionToken?,
-        ) {
-            token?.continuePermissionRequest()
+    private val requestRuntimePermissions = activity.registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { _ ->
+        if (requiredRuntimePermissions().all { isPermissionGranted(it) }) {
+            startProjection.launch(Unit)
+        } else {
+            notifyStartFailed(SecurityException("Required permissions were not granted"))
         }
     }
 
@@ -131,20 +127,27 @@ class CapgoScrCast private constructor(
             return false
         }
         startListener = listener
-        val permissions = buildList {
-            add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            add(Manifest.permission.READ_EXTERNAL_STORAGE)
-            if (recordAudio) {
-                add(Manifest.permission.RECORD_AUDIO)
-            }
+        val missing = requiredRuntimePermissions().filterNot { isPermissionGranted(it) }
+        if (missing.isEmpty()) {
+            startProjection.launch(Unit)
+        } else {
+            requestRuntimePermissions.launch(missing.toTypedArray())
         }
-        Dexter.withContext(activity)
-            .withPermissions(permissions)
-            .withListener(permissionListener)
-            .check()
         return true
     }
 
+    private fun requiredRuntimePermissions(): List<String> = buildList {
+        add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+        add(Manifest.permission.READ_EXTERNAL_STORAGE)
+        if (recordAudio) {
+            add(Manifest.permission.RECORD_AUDIO)
+        }
+    }
+
+    private fun isPermissionGranted(permission: String): Boolean {
+        return ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_GRANTED
+    }
+
     private fun notifyStartFailed(error: Throwable) {
         startListener?.onFailed(error)
         startListener = null
@@ -213,7 +216,7 @@ class CapgoScrCast private constructor(
         receiverRegistered = false
     }
 
-    private fun cleanupSession() {
+    private fun cleanupSession(deleteEmptyOutput: Boolean = false) {
         startListener = null
         unregisterRecordingReceiver()
 
@@ -227,8 +230,12 @@ class CapgoScrCast private constructor(
         recordingSession = null
 
         outputFile?.let { file ->
-            MediaScannerConnection.scanFile(activity, arrayOf(file.absolutePath), null) { path, uri ->
-                Log.i("CapgoScreenRecorder", "Saved recording: $path uri=$uri")
+            if (file.isFile && file.length() > 0L) {
+                MediaScannerConnection.scanFile(activity, arrayOf(file.absolutePath), null) { path, uri ->
+                    Log.i("CapgoScreenRecorder", "Saved recording: $path uri=$uri")
+                }
+            } else if (deleteEmptyOutput && file.exists()) {
+                runCatching { file.delete() }
             }
         }
         outputFile = null

package/android/src/main/java/ee/forgr/plugin/screenrecorder/ScreenRecorderPlugin.java

@@ -10,7 +10,7 @@ import dev.bmcreations.scrcast.config.Options;
 @CapacitorPlugin(name = "ScreenRecorder")
 public class ScreenRecorderPlugin extends Plugin {
 
-    private final String pluginVersion = "8.3.16";
+    private final String pluginVersion = "8.3.17";
 
     private CapgoScrCast videoRecorder;
     private CapgoScrCast audioRecorder;

package/ios/Sources/ScreenRecorderPlugin/ScreenRecorderPlugin.swift

@@ -7,7 +7,7 @@ import Capacitor
  */
 @objc(ScreenRecorderPlugin)
 public class ScreenRecorderPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.3.16"
+    private let pluginVersion: String = "8.3.17"
     public let identifier = "ScreenRecorderPlugin"
     public let jsName = "ScreenRecorder"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-screen-recorder",
-  "version": "8.3.16",
+  "version": "8.3.17",
   "description": "Record device's screen",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",