react-native-video-trim 6.2.1 → 6.2.3

package/android/src/main/java/com/videotrim/BaseVideoTrimModule.kt

@@ -75,6 +75,8 @@ open class BaseVideoTrimModule internal constructor(
     get() = editorConfig?.hasKey("changeStatusBarColorOnOpen") == true && editorConfig?.getBoolean("changeStatusBarColorOnOpen") == true
 
   init {
+    reactApplicationContext.addLifecycleEventListener(this)
+
     val mActivityEventListener = object : BaseActivityEventListener() {
       override fun onActivityResult(
         activity: Activity,
@@ -137,7 +139,10 @@ open class BaseVideoTrimModule internal constructor(
 
     this.isVideoType = config.hasKey("type") && config.getString("type") == "video"
 
-    val activity = reactApplicationContext.currentActivity
+    val activity = reactApplicationContext.currentActivity ?: run {
+      onError("Activity is not available", ErrorCode.UNKNOWN)
+      return
+    }
     if (!isInit) {
       init()
       isInit = true
@@ -150,7 +155,7 @@ open class BaseVideoTrimModule internal constructor(
       trimmerView?.initByURI(filePath.toUri())
 
       val builder = AlertDialog.Builder(
-        activity!!, Theme_Black_NoTitleBar_Fullscreen
+        activity, Theme_Black_NoTitleBar_Fullscreen
       )
       builder.setCancelable(false)
       alertDialog = builder.create()
@@ -158,18 +163,17 @@ open class BaseVideoTrimModule internal constructor(
 
       // Apply safe area handling after the dialog is shown
       alertDialog?.setOnShowListener {
-        applySafeAreaToDialog(alertDialog!!, trimmerView!!)
+        val dialog = alertDialog ?: return@setOnShowListener
+        val view = trimmerView ?: return@setOnShowListener
+        applySafeAreaToDialog(dialog, view)
 
         sendEvent("onShow", null)
       }
 
       // this is to ensure to release resource if dialog is dismissed in unexpected way (Eg. open control/notification center by dragging from top of screen)
-      alertDialog!!.setOnDismissListener {
-        // This is called in same thread as the trimmer view -> UI thread
-        if (trimmerView != null) {
-          trimmerView!!.onDestroy()
-          trimmerView = null
-        }
+      alertDialog?.setOnDismissListener {
+        trimmerView?.onDestroy()
+        trimmerView = null
         hideDialog(true)
         sendEvent("onHide", null)
       }
@@ -195,7 +199,7 @@ open class BaseVideoTrimModule internal constructor(
       it.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 
       // finally change the color
-      it.statusBarColor = ContextCompat.getColor(reactApplicationContext.currentActivity!!,R.color.black)
+      it.statusBarColor = ContextCompat.getColor(reactApplicationContext, R.color.black)
     }
   }
 
@@ -251,9 +255,7 @@ open class BaseVideoTrimModule internal constructor(
 
   override fun onHostPause() {
     Log.d(TAG, "onHostPause: ")
-    if (trimmerView != null) {
-      trimmerView!!.onMediaPause()
-    }
+    trimmerView?.onMediaPause()
   }
 
   override fun onHostDestroy() {
@@ -277,7 +279,7 @@ open class BaseVideoTrimModule internal constructor(
       return
     }
 
-    mProgressBar!!.setProgress(percentage, true)
+    mProgressBar?.setProgress(percentage, true)
   }
 
 
@@ -312,10 +314,11 @@ open class BaseVideoTrimModule internal constructor(
         hideDialog(editorConfig?.getBoolean("closeWhenFinish") ?: true)
       }
     } else if (editorConfig?.getBoolean("openDocumentsOnFinish") == true) {
-      saveFileToExternalStorage(File(outputFile!!))
+      val output = outputFile ?: return
+      saveFileToExternalStorage(File(output))
     } else if (editorConfig?.getBoolean("openShareSheetOnFinish") == true) {
       hideDialog(editorConfig?.getBoolean("closeWhenFinish") ?: true)
-      shareFile(reactApplicationContext, File(outputFile!!))
+      outputFile?.let { shareFile(reactApplicationContext, File(it)) }
     } else {
       hideDialog(editorConfig?.getBoolean("closeWhenFinish") ?: true)
     }
@@ -333,13 +336,14 @@ open class BaseVideoTrimModule internal constructor(
   }
 
   override fun onCancel() {
-    if (!editorConfig?.getBoolean("enableCancelDialog")!!) {
+    if (editorConfig?.getBoolean("enableCancelDialog") != true) {
       sendEvent("onCancel", null)
       hideDialog(true)
       return
     }
 
-    val builder = AlertDialog.Builder(reactApplicationContext.currentActivity!!)
+    val activity = reactApplicationContext.currentActivity ?: return
+    val builder = AlertDialog.Builder(activity)
     builder.setMessage(editorConfig?.getString("cancelDialogMessage"))
     builder.setTitle(editorConfig?.getString("cancelDialogTitle"))
     builder.setCancelable(false)
@@ -358,12 +362,13 @@ open class BaseVideoTrimModule internal constructor(
   }
 
   override fun onSave() {
-    if (!editorConfig?.getBoolean("enableSaveDialog")!!) {
+    if (editorConfig?.getBoolean("enableSaveDialog") != true) {
       startTrim()
       return
     }
 
-    val builder = AlertDialog.Builder(reactApplicationContext.currentActivity!!)
+    val activity = reactApplicationContext.currentActivity ?: return
+    val builder = AlertDialog.Builder(activity)
     builder.setMessage(editorConfig?.getString("saveDialogMessage"))
     builder.setTitle(editorConfig?.getString("saveDialogTitle"))
     builder.setCancelable(false)
@@ -389,7 +394,7 @@ open class BaseVideoTrimModule internal constructor(
   }
 
   private fun startTrim() {
-    val activity = reactApplicationContext.currentActivity
+    val activity = reactApplicationContext.currentActivity ?: return
     // Create the parent layout for the dialog
     val layout = LinearLayout(activity)
     layout.layoutParams = ViewGroup.LayoutParams(
@@ -413,12 +418,13 @@ open class BaseVideoTrimModule internal constructor(
     layout.addView(textView)
 
     // Create and add the ProgressBar
-    mProgressBar = ProgressBar(activity, null, progressBarStyleHorizontal)
-    mProgressBar!!.layoutParams = ViewGroup.LayoutParams(
-      ViewGroup.LayoutParams.MATCH_PARENT,
-      ViewGroup.LayoutParams.WRAP_CONTENT
-    )
-    mProgressBar!!.progressTintList = ColorStateList.valueOf("#2196F3".toColorInt())
+    mProgressBar = ProgressBar(activity, null, progressBarStyleHorizontal).also {
+      it.layoutParams = ViewGroup.LayoutParams(
+        ViewGroup.LayoutParams.MATCH_PARENT,
+        ViewGroup.LayoutParams.WRAP_CONTENT
+      )
+      it.progressTintList = ColorStateList.valueOf("#2196F3".toColorInt())
+    }
     layout.addView(mProgressBar)
 
     // Create button
@@ -433,10 +439,10 @@ open class BaseVideoTrimModule internal constructor(
         ?: "Cancel Trimming"
       button.setTextColor(
         ContextCompat.getColor(
-          activity!!,
+          activity,
           holo_red_light
         )
-      ) // or use your custom color
+      )
 
       // Apply ripple effect while keeping the button background transparent
       val outValue = TypedValue()
@@ -451,11 +457,9 @@ open class BaseVideoTrimModule internal constructor(
           builder.setTitle(editorConfig?.getString("cancelTrimmingDialogTitle"))
           builder.setCancelable(false)
           builder.setPositiveButton(editorConfig?.getString("cancelTrimmingDialogConfirmText")) { _: DialogInterface?, _: Int ->
-            if (trimmerView != null) {
-              trimmerView!!.onCancelTrimClicked()
-            }
-            if (mProgressDialog != null && mProgressDialog!!.isShowing) {
-              mProgressDialog!!.dismiss()
+            trimmerView?.onCancelTrimClicked()
+            if (mProgressDialog?.isShowing == true) {
+              mProgressDialog?.dismiss()
             }
           }
           builder.setNegativeButton(
@@ -464,14 +468,12 @@ open class BaseVideoTrimModule internal constructor(
             dialog.cancel()
           }
           cancelTrimmingConfirmDialog = builder.create()
-          cancelTrimmingConfirmDialog!!.show()
+          cancelTrimmingConfirmDialog?.show()
         } else {
-          if (trimmerView != null) {
-            trimmerView!!.onCancelTrimClicked()
-          }
+          trimmerView?.onCancelTrimClicked()
 
-          if (mProgressDialog != null && mProgressDialog!!.isShowing) {
-            mProgressDialog!!.dismiss()
+          if (mProgressDialog?.isShowing == true) {
+            mProgressDialog?.dismiss()
           }
         }
       }
@@ -480,7 +482,7 @@ open class BaseVideoTrimModule internal constructor(
 
     // Create the AlertDialog
     val builder = AlertDialog.Builder(
-      activity!!
+      activity
     )
     builder.setCancelable(false)
     builder.setView(layout)
@@ -488,36 +490,29 @@ open class BaseVideoTrimModule internal constructor(
     // Show the dialog
     mProgressDialog = builder.create()
 
-    mProgressDialog!!.setOnShowListener {
+    mProgressDialog?.setOnShowListener {
       sendEvent("onStartTrimming", null)
-      if (trimmerView != null) {
-        trimmerView!!.onSaveClicked()
-      }
+      trimmerView?.onSaveClicked()
     }
 
-    mProgressDialog!!.show()
+    mProgressDialog?.show()
   }
 
   private fun hideDialog(shouldCloseEditor: Boolean) {
-    // handle the case when the cancel dialog is still showing but the trimming is finished
-    if (cancelTrimmingConfirmDialog != null) {
-      if (cancelTrimmingConfirmDialog!!.isShowing) {
-        cancelTrimmingConfirmDialog!!.dismiss()
-      }
+    cancelTrimmingConfirmDialog?.let {
+      if (it.isShowing) it.dismiss()
       cancelTrimmingConfirmDialog = null
     }
 
-    if (mProgressDialog != null) {
-      if (mProgressDialog!!.isShowing) mProgressDialog!!.dismiss()
+    mProgressDialog?.let {
+      if (it.isShowing) it.dismiss()
       mProgressBar = null
       mProgressDialog = null
     }
 
     if (shouldCloseEditor) {
-      if (alertDialog != null) {
-        if (alertDialog!!.isShowing) {
-          alertDialog!!.dismiss()
-        }
+      alertDialog?.let {
+        if (it.isShowing) it.dismiss()
         alertDialog = null
       }
     }
@@ -550,7 +545,6 @@ open class BaseVideoTrimModule internal constructor(
 
   fun closeEditor() {
     hideDialog(true)
-    sendEvent("onHide", null)
   }
 
   fun isValidFile(url: String, promise: Promise) {
@@ -593,6 +587,11 @@ open class BaseVideoTrimModule internal constructor(
 
     val outputFile = StorageUtil.getOutputPath(reactApplicationContext, options?.getString("outputExt") ?: "mp4")
 
+    val resolvedOutputFile = outputFile ?: run {
+      promise.reject(Exception("Failed to create output file path"))
+      return
+    }
+
     cmds += arrayOf(
       "-i",
       url,
@@ -600,7 +599,7 @@ open class BaseVideoTrimModule internal constructor(
       "copy",
       "-metadata",
       "creation_time=$formattedDateTime",
-      outputFile!!
+      resolvedOutputFile
     )
 
     Log.d(TAG, "Command: ${cmds.joinToString(",")}")
@@ -608,61 +607,60 @@ open class BaseVideoTrimModule internal constructor(
     FFmpegKit.executeWithArgumentsAsync(cmds, { session ->
       val state = session.state
       val returnCode = session.returnCode
-      when {
-        ReturnCode.isSuccess(returnCode) -> {
-          // SUCCESS
-          val duration = endTime - startTime
-          val result = Arguments.createMap()
-          
-          result.putString("outputPath", outputFile)
-          result.putDouble("startTime", startTime)
-          result.putDouble("endTime", endTime)
-          result.putDouble("duration", duration)
-          result.putBoolean("success", true)
-
-          if (options?.getBoolean("saveToPhoto") == true && options.getString("type") == "video") {
-            Log.d(TAG, "Android trim: saveToPhoto is true, attempting to save to gallery")
-            try {
-              StorageUtil.saveVideoToGallery(reactApplicationContext, outputFile)
-              Log.d(TAG, "Edited video saved to Photo Library successfully.")
-              if (options.getBoolean("removeAfterSavedToPhoto")) {
-                Log.d(TAG, "Removing file after successful save to photo")
-                StorageUtil.deleteFile(outputFile)
-              }
+      UiThreadUtil.runOnUiThread {
+        when {
+          ReturnCode.isSuccess(returnCode) -> {
+            val duration = endTime - startTime
+            val result = Arguments.createMap()
+
+            result.putString("outputPath", resolvedOutputFile)
+            result.putDouble("startTime", startTime)
+            result.putDouble("endTime", endTime)
+            result.putDouble("duration", duration)
+            result.putBoolean("success", true)
+
+            if (options?.getBoolean("saveToPhoto") == true && options.getString("type") == "video") {
+              Log.d(TAG, "Android trim: saveToPhoto is true, attempting to save to gallery")
+              try {
+                StorageUtil.saveVideoToGallery(reactApplicationContext, resolvedOutputFile)
+                Log.d(TAG, "Edited video saved to Photo Library successfully.")
+                if (options.getBoolean("removeAfterSavedToPhoto")) {
+                  Log.d(TAG, "Removing file after successful save to photo")
+                  StorageUtil.deleteFile(resolvedOutputFile)
+                }
 
-              promise.resolve(result)
-            } catch (e: IOException) {
-              e.printStackTrace()
+                promise.resolve(result)
+              } catch (e: IOException) {
+                e.printStackTrace()
 
-              if (options.getBoolean("removeAfterFailedToSavePhoto")) {
-                Log.d(TAG, "Removing file after failed save to photo")
-                StorageUtil.deleteFile(outputFile)
+                if (options.getBoolean("removeAfterFailedToSavePhoto")) {
+                  Log.d(TAG, "Removing file after failed save to photo")
+                  StorageUtil.deleteFile(resolvedOutputFile)
+                }
+
+                promise.reject(
+                  Exception("Failed to save edited video to Photo Library: " + e.localizedMessage)
+                )
               }
+            } else {
+              Log.d(TAG, "Android trim: saveToPhoto is false or not video type, resolving with structured result")
 
-              promise.reject(
-                Exception("Failed to save edited video to Photo Library: " + e.localizedMessage)
-              )
+              promise.resolve(result)
             }
-          } else {
-            Log.d(TAG, "Android trim: saveToPhoto is false or not video type, resolving with structured result")
-
-            promise.resolve(result)
           }
-        }
-        ReturnCode.isCancel(returnCode) -> {
-          // CANCEL
-          println("FFmpeg command was cancelled")
-          promise.reject(
-            Exception("FFmpeg command was cancelled with code $returnCode")
-          )
-        }
-        else -> {
-          // FAILURE
-          val errorMessage = String.format("Command failed with state %s and rc %s.%s", state, returnCode, session.getFailStackTrace());
-          Log.d(TAG, errorMessage)
-          promise.reject(
-            Exception(errorMessage)
-          )
+          ReturnCode.isCancel(returnCode) -> {
+            println("FFmpeg command was cancelled")
+            promise.reject(
+              Exception("FFmpeg command was cancelled with code $returnCode")
+            )
+          }
+          else -> {
+            val errorMessage = String.format("Command failed with state %s and rc %s.%s", state, returnCode, session.getFailStackTrace())
+            Log.d(TAG, errorMessage)
+            promise.reject(
+              Exception(errorMessage)
+            )
+          }
         }
       }
     }, { log ->
@@ -701,6 +699,10 @@ open class BaseVideoTrimModule internal constructor(
     reactApplicationContext.currentActivity?.startActivity(Intent.createChooser(shareIntent, "Share file"))
   }
 
+  fun cleanup() {
+    reactApplicationContext.removeLifecycleEventListener(this)
+  }
+
   companion object {
     const val NAME = "VideoTrim"
     const val TAG = "VideoTrimModule"

package/android/src/main/java/com/videotrim/enums/ErrorCode.kt

@@ -6,5 +6,6 @@ enum class ErrorCode {
   FAIL_TO_INITIALIZE_AUDIO_PLAYER,
   FAIL_TO_LOAD_MEDIA,
   FAIL_TO_SAVE_TO_PHOTO,
-  FAIL_TO_SAVE_TO_DOCUMENTS
+  FAIL_TO_SAVE_TO_DOCUMENTS,
+  UNKNOWN
 }

package/android/src/main/java/com/videotrim/utils/MediaMetadataUtil.kt

@@ -3,6 +3,7 @@ package com.videotrim.utils
 import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.util.Log
+import com.facebook.react.bridge.UiThreadUtil
 import java.io.IOException
 
 object MediaMetadataUtil {
@@ -47,7 +48,7 @@ object MediaMetadataUtil {
     Thread {
       val retriever = getMediaMetadataRetriever(urlString)
       if (retriever == null) {
-        callback.onResult(false, "unknown", -1L)
+        UiThreadUtil.runOnUiThread { callback.onResult(false, "unknown", -1L) }
         return@Thread
       }
 
@@ -74,7 +75,10 @@ object MediaMetadataUtil {
       } catch (e: IOException) {
         Log.e(TAG, "Error releasing retriever", e)
       }
-      callback.onResult(isValid, fileType, if (isValid) duration else -1L)
+      val resultIsValid = isValid
+      val resultFileType = fileType
+      val resultDuration = if (isValid) duration else -1L
+      UiThreadUtil.runOnUiThread { callback.onResult(resultIsValid, resultFileType, resultDuration) }
     }.start()
   }
 

package/android/src/main/java/com/videotrim/utils/StorageUtil.kt

@@ -9,6 +9,7 @@ import android.os.Environment
 import android.provider.MediaStore
 import android.text.TextUtils
 import com.facebook.react.bridge.ReactApplicationContext
+import iknow.android.utils.BaseUtils
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -38,7 +39,10 @@ object StorageUtil {
 
   fun deleteFile(path: String?): Boolean {
     if (TextUtils.isEmpty(path)) return true
-    return deleteFile(File(path!!))
+    val file = File(path!!).canonicalFile
+    val allowedDir = BaseUtils.getContext().filesDir.canonicalFile
+    if (!file.path.startsWith(allowedDir.path)) return false
+    return deleteFile(file)
   }
 
   fun deleteFile(file: File?): Boolean {

package/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.kt

@@ -8,6 +8,7 @@ import com.arthenica.ffmpegkit.FFmpegKit
 import com.arthenica.ffmpegkit.FFmpegSession
 import com.arthenica.ffmpegkit.ReturnCode
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.UiThreadUtil
 import com.videotrim.enums.ErrorCode
 import com.videotrim.interfaces.VideoTrimListener
 import iknow.android.utils.DeviceUtil
@@ -82,16 +83,18 @@ object VideoTrimmerUtil {
     return FFmpegKit.executeWithArgumentsAsync(command, { session ->
       val state = session.state
       val returnCode = session.returnCode
-      when {
-        ReturnCode.isSuccess(session.returnCode) -> {
-          callback.onFinishTrim(outputFile, startMs, endMs, videoDuration)
-        }
-        ReturnCode.isCancel(session.returnCode) -> {
-          callback.onCancelTrim()
-        }
-        else -> {
-          val errorMessage = "Command failed with state $state and rc $returnCode.${session.failStackTrace}"
-          callback.onError(errorMessage, ErrorCode.TRIMMING_FAILED)
+      UiThreadUtil.runOnUiThread {
+        when {
+          ReturnCode.isSuccess(returnCode) -> {
+            callback.onFinishTrim(outputFile, startMs, endMs, videoDuration)
+          }
+          ReturnCode.isCancel(returnCode) -> {
+            callback.onCancelTrim()
+          }
+          else -> {
+            val errorMessage = "Command failed with state $state and rc $returnCode.${session.failStackTrace}"
+            callback.onError(errorMessage, ErrorCode.TRIMMING_FAILED)
+          }
         }
       }
     }, { log ->
@@ -102,12 +105,16 @@ object VideoTrimmerUtil {
       map.putString("message", log.message)
       map.putDouble("sessionId", log.sessionId.toDouble())
       map.putString("logStr", log.toString())
-      callback.onLog(map)
+      UiThreadUtil.runOnUiThread {
+        callback.onLog(map)
+      }
     }, { statistics ->
       val timeInMilliseconds = statistics.time.toInt()
       if (timeInMilliseconds > 0) {
         val completePercentage = (timeInMilliseconds * 100) / videoDuration
-        callback.onTrimmingProgress(completePercentage.coerceIn(0, 100))
+        UiThreadUtil.runOnUiThread {
+          callback.onTrimmingProgress(completePercentage.coerceIn(0, 100))
+        }
       }
 
       val map = Arguments.createMap()
@@ -120,7 +127,9 @@ object VideoTrimmerUtil {
       map.putDouble("bitrate", statistics.bitrate.toDouble())
       map.putDouble("speed", statistics.speed.toDouble())
       map.putString("statisticsStr", statistics.toString())
-      callback.onStatistics(map)
+      UiThreadUtil.runOnUiThread {
+        callback.onStatistics(map)
+      }
     })
   }
 

package/android/src/main/java/com/videotrim/widgets/VideoTrimmerView.kt

@@ -124,6 +124,8 @@ class VideoTrimmerView(
   private var isGeneratingThumbnails = false
 
   private var mediaMetadataRetriever: MediaMetadataRetriever? = null
+  private val retrieverLock = Object()
+  @Volatile private var retrieverReleased = false
   private lateinit var loadingIndicator: ProgressBar
   private lateinit var saveBtn: TextView
   private lateinit var cancelBtn: TextView
@@ -158,7 +160,7 @@ class VideoTrimmerView(
   private fun init(context: ReactApplicationContext, config: ReadableMap?) {
     mContext = context
 
-    context.currentActivity!!.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+    context.currentActivity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
     LayoutInflater.from(context).inflate(R.layout.video_trimmer_view, this, true)
     vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
 
@@ -256,7 +258,8 @@ class VideoTrimmerView(
     mediaFailed()
     mOnTrimVideoListener.onError("Error loading media file. Please try again.", ErrorCode.FAIL_TO_LOAD_MEDIA)
     if (alertOnFailToLoad) {
-      val builder = AlertDialog.Builder(mContext.currentActivity!!)
+      val activity = mContext.currentActivity ?: return true
+      val builder = AlertDialog.Builder(activity)
       builder.setMessage(alertOnFailMessage)
       builder.setTitle(alertOnFailTitle)
       builder.setCancelable(false)
@@ -462,6 +465,7 @@ class VideoTrimmerView(
   override fun onDestroy() {
     isGeneratingThumbnails = false
     BackgroundExecutor.cancelAll("", true)
+    BackgroundExecutor.cancelAll("progressive_thumbs", true)
     UiThreadExecutor.cancelAll("")
     mContext.currentActivity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
     mTimingRunnable?.let { mTimingHandler.removeCallbacks(it) }
@@ -469,10 +473,13 @@ class VideoTrimmerView(
 
     cachedFullViewThumbnails.clear()
 
-    try {
-      mediaMetadataRetriever?.release()
-    } catch (e: Exception) {
-      e.printStackTrace()
+    synchronized(retrieverLock) {
+      retrieverReleased = true
+      try {
+        mediaMetadataRetriever?.release()
+      } catch (e: Exception) {
+        e.printStackTrace()
+      }
     }
 
     try {
@@ -1069,7 +1076,9 @@ class VideoTrimmerView(
             val clampedTimeUs = maxOf(0L, minOf(timeUs, mDuration * 1000L))
 
             try {
-              val bitmap = mediaMetadataRetriever?.getFrameAtTime(clampedTimeUs, MediaMetadataRetriever.OPTION_CLOSEST_SYNC)
+              val bitmap = synchronized(retrieverLock) {
+                if (retrieverReleased) null else mediaMetadataRetriever?.getFrameAtTime(clampedTimeUs, MediaMetadataRetriever.OPTION_CLOSEST_SYNC)
+              }
               if (bitmap != null && isGeneratingThumbnails && isZoomedIn) {
                 UiThreadExecutor.runTask("", {
                   if (isZoomedIn && index < mThumbnailContainer.childCount) {

package/android/src/main/res/xml/file_paths.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
   <files-path name="internal_files" path="." />
-  <external-path name="external_files" path="." />
+  <cache-path name="cache_files" path="." />
 </paths>

package/ios/VideoTrim.swift

@@ -8,6 +8,7 @@ let FILE_PREFIX = "trimmedVideo"
 public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate {
   // MARK: instance private props
   private var isShowing = false
+  private var isTrimming = false
   private var vc: VideoTrimmerViewController?
   private var outputFile: URL?
   private var editorConfig: NSDictionary?
@@ -260,6 +261,9 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
   }
   
   private func trim(viewController: VideoTrimmerViewController, inputFile: URL, videoDuration: Double, startTime: Double, endTime: Double, isVideoType: Bool) {
+    guard !isTrimming else { return }
+    isTrimming = true
+
     vc?.pausePlayer()
     
     let timestamp = Int(Date().timeIntervalSince1970)
@@ -289,7 +293,7 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
           dialogMessage.overrideUserInterfaceStyle = .dark
           
           // Create OK button with action handler
-          let ok = UIAlertAction(title: self.cancelDialogConfirmText, style: .destructive, handler: { (action) -> Void in
+          let ok = UIAlertAction(title: self.cancelTrimmingDialogConfirmText, style: .destructive, handler: { (action) -> Void in
             
             if let ffmpegSession = ffmpegSession {
               ffmpegSession.cancel()
@@ -297,11 +301,13 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
               self.emitEventToJS("onCancelTrimming", eventData: nil)
             }
             
-            progressAlert.dismiss(animated: true)
+            progressAlert.dismiss(animated: true) {
+              self.isTrimming = false
+            }
           })
           
           // Create Cancel button with action handlder
-          let cancel = UIAlertAction(title: self.cancelDialogCancelText, style: .cancel)
+          let cancel = UIAlertAction(title: self.cancelTrimmingDialogCancelText, style: .cancel)
           
           //Add OK and Cancel button to an Alert object
           dialogMessage.addAction(ok)
@@ -318,7 +324,9 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
             self.emitEventToJS("onCancelTrimming", eventData: nil)
           }
           
-          progressAlert.dismiss(animated: true)
+          progressAlert.dismiss(animated: true) {
+            self.isTrimming = false
+          }
         }
         
       }
@@ -339,6 +347,11 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
       cmds.append(contentsOf: ["-display_rotation", "\(rotationAngle)"])
     }
     
+    guard let outputFile = outputFile else {
+      self.onError(message: "Output file path is nil", code: .trimmingFailed)
+      return
+    }
+
     cmds.append(contentsOf: [
       "-i",
       inputFile.path,
@@ -346,7 +359,7 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
       "copy",
       "-metadata",
       "creation_time=\(dateTime)",
-      outputFile!.path
+      outputFile.path
     ])
     
     print("Command: ", cmds.joined(separator: " "))
@@ -358,16 +371,13 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
     
     ffmpegSession = FFmpegKit.execute(withArgumentsAsync: cmds, withCompleteCallback: { session in
       
-      // always hide progressAlert
-      DispatchQueue.main.async {
-        progressAlert.dismiss(animated: true)
-      }
-      
       let state = session?.getState()
       let returnCode = session?.getReturnCode()
       
+      var shouldCloseEditor = false
+      
       if ReturnCode.isSuccess(returnCode) {
-        let eventPayload: [String: Any] = ["outputPath": self.outputFile!.absoluteString, "startTime": (startTime * 1000).rounded(), "endTime": (endTime * 1000).rounded(), "duration": (videoDuration * 1000).rounded()]
+        let eventPayload: [String: Any] = ["outputPath": outputFile.absoluteString, "startTime": (startTime * 1000).rounded(), "endTime": (endTime * 1000).rounded(), "duration": (videoDuration * 1000).rounded()]
         self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
         
         if (self.saveToPhoto && isVideoType) {
@@ -378,38 +388,42 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
             }
             
             PHPhotoLibrary.shared().performChanges({
-              let request = PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: self.outputFile!)
+              let request = PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: outputFile)
               request?.creationDate = Date()
             }) { success, error in
               if success {
                 print("Edited video saved to Photo Library successfully.")
                 
                 if self.removeAfterSavedToPhoto {
-                  let _ = VideoTrim.deleteFile(url: self.outputFile!)
+                  let _ = VideoTrim.deleteFile(url: outputFile)
                 }
               } else {
                 self.onError(message: "Failed to save edited video to Photo Library: \(error?.localizedDescription ?? "Unknown error")", code: .failToSaveToPhoto)
                 if self.removeAfterFailedToSavePhoto {
-                  let _ = VideoTrim.deleteFile(url: self.outputFile!)
+                  let _ = VideoTrim.deleteFile(url: outputFile)
                 }
               }
             }
           }
         } else if self.openDocumentsOnFinish {
-          self.saveFileToFilesApp(fileURL: self.outputFile!)
-          
-          // must return otherwise editor will close
+          DispatchQueue.main.async {
+            progressAlert.dismiss(animated: true) {
+              self.isTrimming = false
+              self.saveFileToFilesApp(fileURL: outputFile)
+            }
+          }
           return
         } else if self.openShareSheetOnFinish {
-          self.shareFile(fileURL: self.outputFile!)
-          
-          // must return otherwise editor will close
+          DispatchQueue.main.async {
+            progressAlert.dismiss(animated: true) {
+              self.isTrimming = false
+              self.shareFile(fileURL: outputFile)
+            }
+          }
           return
         }
         
-        if self.closeWhenFinish {
-          self.closeEditor(delay: 500)
-        }
+        shouldCloseEditor = self.closeWhenFinish
         
       } else if ReturnCode.isCancel(returnCode) {
         // CANCEL
@@ -417,8 +431,15 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
       } else {
         // FAILURE
         self.onError(message: "Command failed with state \(String(describing: FFmpegKitConfig.sessionState(toString: state ?? .failed))) and rc \(String(describing: returnCode)).\(String(describing: session?.getFailStackTrace()))", code: .trimmingFailed)
-        if self.closeWhenFinish {
-          self.closeEditor(delay: 500)
+        shouldCloseEditor = self.closeWhenFinish
+      }
+      
+      DispatchQueue.main.async {
+        progressAlert.dismiss(animated: true) {
+          self.isTrimming = false
+          if shouldCloseEditor {
+            self.closeEditor()
+          }
         }
       }
       
@@ -463,9 +484,7 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
   // New Arch
   @objc(trim:url:config:)
   public func _trim(inputFile: String, config: NSDictionary, completion: @escaping ([String: Any]) -> Void) {
-    let destPath = URL(string: inputFile)
-    
-    guard let destPath = destPath else {
+    guard let destPath = URL(string: inputFile) ?? URL(fileURLWithPath: inputFile) as URL? else {
       let result = [
         "success": false,
         "message": "Invalid input file path",
@@ -661,21 +680,21 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
           print(message)
           self.onError(message: message, code: .failToShare)
           
-          if self.removeAfterFailedToShare {
-            let _ = VideoTrim.deleteFile(url: self.outputFile!)
+          if self.removeAfterFailedToShare, let outputFile = self.outputFile {
+            let _ = VideoTrim.deleteFile(url: outputFile)
           }
           return
         }
         
         if completed {
           print("User completed the sharing activity")
-          if self.removeAfterShared {
-            let _ = VideoTrim.deleteFile(url: self.outputFile!)
+          if self.removeAfterShared, let outputFile = self.outputFile {
+            let _ = VideoTrim.deleteFile(url: outputFile)
           }
         } else {
           print("User cancelled or failed to complete the sharing activity")
-          if self.removeAfterFailedToShare {
-            let _ = VideoTrim.deleteFile(url: self.outputFile!)
+          if self.removeAfterFailedToShare, let outputFile = self.outputFile {
+            let _ = VideoTrim.deleteFile(url: outputFile)
           }
         }
         
@@ -711,10 +730,8 @@ extension VideoTrim {
     editorConfig = config
     print("Show editor called with URI: \(uri)")
     
-    let destPath = URL(string: uri)
-    print("Destination Path: \(destPath!.absoluteString), path: \(destPath!.path)")
-    
-    guard let destPath = destPath else { return }
+    guard let destPath = URL(string: uri) ?? URL(fileURLWithPath: uri) as URL? else { return }
+    print("Destination Path: \(destPath.absoluteString), path: \(destPath.path)")
     
     DispatchQueue.main.async {
       self.vc = VideoTrimmerViewController()
@@ -757,8 +774,9 @@ extension VideoTrim {
       let isVideoType = (config["type"] as? String ?? "video") == "video"
       
       vc.saveBtnClicked = {(selectedRange: CMTimeRange) in
+        guard let asset = vc.asset else { return }
         if !self.enableSaveDialog {
-          self.trim(viewController: vc,inputFile: destPath, videoDuration: self.vc!.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds, isVideoType: isVideoType)
+          self.trim(viewController: vc,inputFile: destPath, videoDuration: asset.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds, isVideoType: isVideoType)
           return
         }
         
@@ -768,7 +786,7 @@ extension VideoTrim {
         
         // Create OK button with action handler
         let ok = UIAlertAction(title: self.saveDialogConfirmText, style: .default, handler: { (action) -> Void in
-          self.trim(viewController: vc,inputFile: destPath, videoDuration: vc.asset!.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds, isVideoType: isVideoType)
+          self.trim(viewController: vc,inputFile: destPath, videoDuration: asset.duration.seconds, startTime: selectedRange.start.seconds, endTime: selectedRange.end.seconds, isVideoType: isVideoType)
         })
         
         // Create Cancel button with action handlder
@@ -809,15 +827,19 @@ extension VideoTrim {
   @objc(closeEditor:)
   public func closeEditor(delay: Int = 0) {
     guard let vc = vc else { return }
-    // some how in case we trim a very short video the view controller is still visible after first .dismiss call
-    // even the file is successfully saved
-    // that's why we need a small delay here to ensure vc will be dismissed
-    DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(delay)) {
+    let dismissBlock = {
       vc.dismiss(animated: true, completion: {
         self.emitEventToJS("onHide", eventData: nil)
         self.isShowing = false
+        self.vc = nil
       })
     }
+
+    if delay > 0 {
+      DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(delay), execute: dismissBlock)
+    } else {
+      DispatchQueue.main.async(execute: dismissBlock)
+    }
   }
   
   // Old Arch
@@ -866,7 +888,8 @@ extension VideoTrim {
   // New Arch
   @objc(deleteFile:)
   public static func deleteFile(uri: String) -> Bool {
-    let state = deleteFile(url: URL(string: uri)!)
+    guard let url = URL(string: uri) else { return false }
+    let state = deleteFile(url: url)
     return state == 0
   }
   
@@ -899,7 +922,10 @@ extension VideoTrim {
   // New Arch
   @objc(isValidFile:url:)
   public static func isValidFile(url: String, completion: @escaping ([String: Any]) -> Void) -> Void {
-    let fileURL = URL(string: url)!
+    guard let fileURL = URL(string: url) ?? URL(fileURLWithPath: url) as URL? else {
+      completion(["isValid": false, "fileType": "unknown", "duration": -1])
+      return
+    }
     checkFileValidity(url: fileURL) { isValid, fileType, duration in
       if isValid {
         print("Valid \(fileType) file with duration: \(duration) milliseconds")
@@ -999,8 +1025,9 @@ extension VideoTrim {
     
     vc?.asset = loader.asset
     
+    let duration = loader.asset?.duration.seconds ?? 0
     let eventPayload: [String: Any] = [
-      "duration": loader.asset!.duration.seconds * 1000,
+      "duration": duration * 1000,
     ]
     self.emitEventToJS("onLoad", eventData: eventPayload)
   }
@@ -1010,15 +1037,15 @@ extension VideoTrim {
 // MARK: DocumentPicker delegate
 extension VideoTrim {
   public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
-    if removeAfterSavedToDocuments {
-      let _ = VideoTrim.deleteFile(url: outputFile!)
+    if removeAfterSavedToDocuments, let outputFile = self.outputFile {
+      let _ = VideoTrim.deleteFile(url: outputFile)
     }
     closeEditor()
   }
   
   public func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
-    if removeAfterFailedToSaveDocuments {
-      let _ = VideoTrim.deleteFile(url: outputFile!)
+    if removeAfterFailedToSaveDocuments, let outputFile = self.outputFile {
+      let _ = VideoTrim.deleteFile(url: outputFile)
     }
     closeEditor()
   }

package/ios/VideoTrimmer.swift

@@ -446,17 +446,15 @@ import AVFoundation
             self.thumbnails.removeAll(where: {uuidsToRemove.contains($0.uuid)})
         })
         
-        var seenIndex = 0
         generator.requestedTimeToleranceBefore = .zero
         generator.requestedTimeToleranceAfter = .zero
         generator.generateCGImagesAsynchronously(forTimes: times) { requestedTime, cgImage, actualTime, result, error in
             DispatchQueue.main.async {
-                seenIndex += 1
-                
                 guard let cgImage = cgImage else {return}
+                guard let index = newThumbnails.firstIndex(where: { CMTimeCompare($0.time, requestedTime) == 0 }) else {return}
                 let image = UIImage(cgImage: cgImage)
                 
-                let imageView = newThumbnails[seenIndex - 1].imageView
+                let imageView = newThumbnails[index].imageView
                 UIView.transition(with: imageView, duration: 0.25, options: [.transitionCrossDissolve], animations: {
                     imageView.image = image
                 })

package/ios/VideoTrimmerViewController.swift

@@ -69,6 +69,7 @@ class VideoTrimmerViewController: UIViewController {
     private let audioBannerView = UIImage(systemName: "airpodsmax")
     private var player: AVPlayer! { playerController.player }
     private var timeObserverToken: Any?
+    private var statusObservation: NSKeyValueObservation?
     private var autoplay = false
     private var jumpToPositionOnLoad: Double = 0;
     private var headerText: String?
@@ -197,8 +198,8 @@ class VideoTrimmerViewController: UIViewController {
         guard let _ = asset else { return }
         player.pause()
         
-        // Clean up the observer
-        player.removeObserver(self, forKeyPath: "status")
+        statusObservation?.invalidate()
+        statusObservation = nil
         
         if let token = timeObserverToken {
             player.removeTimeObserver(token)
@@ -391,15 +392,19 @@ class VideoTrimmerViewController: UIViewController {
     }
     
     private func setupPlayerController() {
+        guard let asset = asset else { return }
         playerController.showsPlaybackControls = false
         if #available(iOS 16.0, *) {
             playerController.allowsVideoFrameAnalysis = false
         }
         playerController.player = AVPlayer()
-        player.replaceCurrentItem(with: AVPlayerItem(asset: asset!))
+        player.replaceCurrentItem(with: AVPlayerItem(asset: asset))
         
-        // Add observer for player status
-        player.addObserver(self, forKeyPath: "status", options: [.new, .initial], context: nil)
+        statusObservation = player.observe(\.status, options: [.new, .initial]) { [weak self] player, _ in
+            DispatchQueue.main.async {
+                self?.onPlayerReady()
+            }
+        }
         
         try? AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
         addChild(playerController)
@@ -512,35 +517,33 @@ class VideoTrimmerViewController: UIViewController {
     }
   }
     
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if keyPath == "status" {
-            if player.status == .readyToPlay {
-                loadingIndicator.stopAnimating()
-                btnStackView.removeArrangedSubview(loadingIndicator)
-                loadingIndicator.removeFromSuperview()
-                btnStackView.insertArrangedSubview(playBtn, at: 1)
-                
-                UIView.animate(withDuration: 0.25, animations: {
-                    self.playBtn.alpha = 1
-                    self.playBtn.isEnabled = true
-                    self.saveBtn.alpha = 1
-                    self.saveBtn.isEnabled = true
-                })
-                
-                if jumpToPositionOnLoad > 0 {
-                    let duration = (asset?.duration.seconds ?? 0) * 1000
-                    let time = jumpToPositionOnLoad > duration ? duration : jumpToPositionOnLoad
-                    let cmtime = CMTime(value: CMTimeValue(time), timescale: 1000)
-                    
-                    self.seek(to: cmtime)
-                    self.trimmer.progress = cmtime
-                    self.currentTimeLabel.text = self.trimmer.progress.displayString
-                }
-                
-                if autoplay {
-                    togglePlay(sender: playBtn)
-                }
-            }
+    private func onPlayerReady() {
+        guard player.status == .readyToPlay else { return }
+        
+        loadingIndicator.stopAnimating()
+        btnStackView.removeArrangedSubview(loadingIndicator)
+        loadingIndicator.removeFromSuperview()
+        btnStackView.insertArrangedSubview(playBtn, at: 1)
+        
+        UIView.animate(withDuration: 0.25, animations: {
+            self.playBtn.alpha = 1
+            self.playBtn.isEnabled = true
+            self.saveBtn.alpha = 1
+            self.saveBtn.isEnabled = true
+        })
+        
+        if jumpToPositionOnLoad > 0 {
+            let duration = (asset?.duration.seconds ?? 0) * 1000
+            let time = jumpToPositionOnLoad > duration ? duration : jumpToPositionOnLoad
+            let cmtime = CMTime(value: CMTimeValue(time), timescale: 1000)
+            
+            self.seek(to: cmtime)
+            self.trimmer.progress = cmtime
+            self.currentTimeLabel.text = self.trimmer.progress.displayString
+        }
+        
+        if autoplay {
+            togglePlay(sender: playBtn)
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "description": "Video trimmer for your React Native app",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",