react-native-video-trim 1.0.7 → 1.0.9

package/android/build.gradle

@@ -43,6 +43,22 @@ def supportsNamespace() {
   return major >= 8
 }
 
+static def safePackageName(String packageName) {
+  packageName.replace("-lts", "")
+}
+
+def safePackageVersion(String packageName) {
+  def version = project.properties['ffmpegKit.android.main.version']
+  def ltsVersion = project.properties['ffmpegKit.android.lts.version']
+
+  // try to get ffmpegKitPackageVersion if possible
+  safeExtGet("ffmpegKitPackageVersion", packageName.contains("-lts") ? ltsVersion + ".LTS" : version)
+}
+
+def safeExtGet(String prop, String fallback) {
+  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
   if (supportsNamespace()) {
     namespace "com.videotrim"
@@ -90,7 +106,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation 'androidx.recyclerview:recyclerview:1.3.1'
-  implementation 'com.arthenica:ffmpeg-kit-full:5.1.LTS'
+  implementation 'com.arthenica:ffmpeg-kit-' + safePackageName(safeExtGet('ffmpegKitPackage', 'min')) + ':' + safePackageVersion(safeExtGet('ffmpegKitPackage', 'min'))
 }
 
 if (isNewArchitectureEnabled()) {

package/android/gradle.properties

@@ -3,3 +3,5 @@ VideoTrim_minSdkVersion=21
 VideoTrim_targetSdkVersion=31
 VideoTrim_compileSdkVersion=31
 VideoTrim_ndkversion=21.4.7075529
+ffmpegKit.android.main.version=6.0-2
+ffmpegKit.android.lts.version=6.0-2

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

@@ -222,15 +222,8 @@ public class StorageUtil {
     if (uri != null) {
       try {
         OutputStream outputStream = context.getContentResolver().openOutputStream(uri);
-        if (outputStream != null) {
-          // Copy the video file to the output stream
-          // Here, you can use the method you have to copy the file contents
-          // For example, you can use FileInputStream to read from videoFile and write to outputStream
-
-          outputStream.close();
-          // Notify the media scanner that a new video has been added to the gallery
-          MediaScannerConnection.scanFile(context, new String[]{videoFile.getAbsolutePath()}, new String[]{"video/*"}, null);
-        }
+        copyFile(videoFile, outputStream);
+        MediaScannerConnection.scanFile(context, new String[]{uri.toString()}, new String[]{"video/*"}, null);
       } catch (IOException e) {
         e.printStackTrace();
       }
@@ -245,14 +238,19 @@ public class StorageUtil {
     MediaScannerConnection.scanFile(context, new String[]{destinationFile.getAbsolutePath()}, new String[]{"video/*"}, null);
   }
 
+  private static void copyFile(File sourceFile, OutputStream outputStream) throws IOException {
+    InputStream inputStream = new FileInputStream(sourceFile);
+    copyFile(inputStream, outputStream);
+  }
+
   private static void copyFile(File sourceFile, File destFile) throws IOException {
-    InputStream inputStream = null;
-    OutputStream outputStream = null;
+    InputStream inputStream = new FileInputStream(sourceFile);
+    OutputStream outputStream = new FileOutputStream(destFile);
+    copyFile(inputStream, outputStream);
+  }
 
+  private static void copyFile(InputStream inputStream, OutputStream outputStream) throws IOException {
     try {
-      inputStream = new FileInputStream(sourceFile);
-      outputStream = new FileOutputStream(destFile);
-
       byte[] buffer = new byte[1024];
       int length;
       while ((length = inputStream.read(buffer)) > 0) {

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

@@ -59,7 +59,7 @@ public class VideoTrimmerUtil {
     }, log -> {
 
     }, statistics -> {
-      int timeInMilliseconds = statistics.getTime();
+      int timeInMilliseconds = (int) statistics.getTime();
       if (timeInMilliseconds > 0) {
         int completePercentage =
           (timeInMilliseconds * 100) / videoDuration;

package/package.json

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