react-native-video-trim 1.0.11 → 1.0.13

package/README.md

@@ -97,6 +97,7 @@ export default function App() {
         onPress={async () => {
           const result = await launchImageLibrary({
             mediaType: 'video',
+            assetRepresentationMode: 'current',
           });
 
           isValidVideo(result.assets![0]?.uri || '').then((res) =>

package/android/src/main/java/com/videotrim/VideoTrimModule.java

@@ -181,9 +181,9 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     });
   }
 
-  @Override public void onError() {
+  @Override public void onError(String errorMessage) {
     WritableMap map = Arguments.createMap();
-    map.putString("message", "Error when trimming, please try again");
+    map.putString("message", errorMessage);
     sendEvent(getReactApplicationContext(), "onError", map);
     this.hideDialog();
   }

package/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java

@@ -4,7 +4,7 @@ public interface VideoTrimListener {
   void onStartTrim();
   void onTrimmingProgress(int percentage);
   void onFinishTrim(String url);
-  void onError();
+  void onError(String errorMessage);
   void onCancel();
   void onSave();
 }

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

@@ -18,7 +18,6 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-@SuppressWarnings({ "ResultOfMethodCallIgnored", "FieldCanBeLocal" })
 public class StorageUtil {
   public static String getOutputPath(Context context) { // use same extension as inputFile
     long timestamp = System.currentTimeMillis() / 1000;

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

@@ -4,17 +4,10 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.util.Log;
-
 import com.arthenica.ffmpegkit.FFmpegKit;
 import com.arthenica.ffmpegkit.ReturnCode;
 import com.arthenica.ffmpegkit.SessionState;
 import com.videotrim.interfaces.VideoTrimListener;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
 import iknow.android.utils.DeviceUtil;
 import iknow.android.utils.UnitConverter;
 import iknow.android.utils.callback.SingleCallback;
@@ -37,16 +30,21 @@ public class VideoTrimmerUtil {
   public static final int THUMB_HEIGHT = UnitConverter.dpToPx(50); // x2 for better resolution
   private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
 
-  public static void trim(Context context, String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
+  public static void trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
     String cmd = "-i " + inputFile + " -ss " + startMs + "ms" + " -to " + endMs + "ms -c copy " + outputFile;
     callback.onStartTrim();
     FFmpegKit.executeAsync(cmd, session -> {
       SessionState state = session.getState();
+      ReturnCode returnCode = session.getReturnCode();
 
-      if (state.equals(SessionState.COMPLETED)) {
+      if (ReturnCode.isSuccess(returnCode)) {
+        // SUCCESS
         callback.onFinishTrim(outputFile);
-      } else {
-        callback.onError();
+      }
+      else {
+        // CANCEL + FAILURE
+        String errorMessage = String.format("Command failed with state %s and rc %s.%s", state, returnCode, session.getFailStackTrace());
+        callback.onError(errorMessage);
       }
     }, log -> {
 

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

@@ -271,7 +271,7 @@ public class VideoTrimmerView extends FrameLayout implements IVideoTrimmerView {
       Toast.makeText(mContext, "Video shorter than 3s, can't proceed", Toast.LENGTH_SHORT).show();
     } else {
       mVideoView.pause();
-      VideoTrimmerUtil.trim(mContext,
+      VideoTrimmerUtil.trim(
         mSourceUri.getPath(),
         StorageUtil.getOutputPath(mContext),
         mDuration,

package/ios/VideoTrim.swift

@@ -95,6 +95,7 @@ class VideoTrim: RCTEventEmitter {
                         
                         vc.cancelBtnClicked = {
                             if !self.enableCancelDialog {
+                                let _ = self.deleteFile(url: destPath) // remove the file we just copied to document directory
                                 self.emitEventToJS("onCancelTrimming", eventData: nil)
                                 
                                 vc.dismiss(animated: true, completion: {
@@ -109,6 +110,7 @@ class VideoTrim: RCTEventEmitter {
 
                             // Create OK button with action handler
                             let ok = UIAlertAction(title: self.cancelDialogConfirmText, style: .destructive, handler: { (action) -> Void in
+                                let _ = self.deleteFile(url: destPath) // remove the file we just copied to document directory
                                 self.emitEventToJS("onCancelTrimming", eventData: nil)
                                 
                                 vc.dismiss(animated: true, completion: {
@@ -304,8 +306,9 @@ class VideoTrim: RCTEventEmitter {
             let _ = self.deleteFile(url: inputFile) // remove the file we just copied to document directory
             
             let state = session?.getState()
+            let returnCode = session?.getReturnCode()
             
-            if state == .completed {
+            if ReturnCode.isSuccess(returnCode) {
                 let eventPayload: [String: Any] = ["outputPath": outputFile]
                 self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
                 
@@ -335,11 +338,15 @@ class VideoTrim: RCTEventEmitter {
                     }
                 }
             } else {
-                let eventPayload: [String: Any] = ["message": "Some error occured"]
+                // CANCEL + FAILURE
+                let eventPayload: [String: Any] = ["message": "Command failed with state \(String(describing: FFmpegKitConfig.sessionState(toString: state ?? .failed))) and rc \(String(describing: returnCode)).\(String(describing: session?.getFailStackTrace()))"]
                 self.emitEventToJS("onError", eventData: eventPayload)
             }
             
-            DispatchQueue.main.async {
+            // 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() + 0.5) {
                 dialogMessage.dismiss(animated: false)
                 viewController.dismiss(animated: true, completion: {
                     self.emitEventToJS("onHide", eventData: nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",