Add version 2.4.2

Author: schiewe

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.4.2]
+
+### Fixed
+
+* [Android] Fixed serialization export file URL to include the schema.
+* [Android] Fixed crash when exporting serialization for remote videos.
+* [Android] 🚨 Fixed export result type to `video` which was `image` before.
+
 ## [2.4.1]
 
 * Same version as 2.4.0. Bumped version to keep the version consistent with `react-native-photoeditorsdk`.

README.md

@@ -17,6 +17,8 @@
 
 # React Native module for VideoEditor SDK
 
+Check out our [video tutorial](https://blog.photoeditorsdk.com/a-photo-and-video-editor-for-your-react-native-apps) for a step-by-step integration guide which also details advanced SDK features, such as serializing and reusing previously applied editing operations.
+
 ## Getting started
 
 Install the React Native module in your project as follows:
@@ -81,11 +83,11 @@ For older React Native versions autolinking is not available and VideoEditor SDK
        }
        dependencies {
            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
-           classpath 'ly.img.android.sdk:plugin:7.1.13'
+           classpath 'ly.img.android.sdk:plugin:7.2.5'
        }
    }
    ```
-   In order to update VideoEditor SDK for Android replace the version string `7.1.13` with a [newer release](https://github.com/imgly/vesdk-android-demo/releases).
+   In order to update VideoEditor SDK for Android replace the version string `7.2.5` with a [newer release](https://github.com/imgly/vesdk-android-demo/releases).
 
 3. Configure VideoEditor SDK for Android by opening the `android/app/build.gradle` file  (**not** `android/build.gradle`) and adding the following lines under `apply plugin: "com.android.application"`:
    ```groovy

android/src/main/java/ly/img/react_native/vesdk/RNVideoEditorSDKModule.kt

@@ -20,6 +20,7 @@ import ly.img.android.pesdk.ui.activity.ImgLyIntent
 import ly.img.android.pesdk.ui.activity.VideoEditorBuilder
 import ly.img.android.pesdk.ui.utils.PermissionRequest
 import ly.img.android.pesdk.utils.MainThreadRunnable
+import ly.img.android.pesdk.utils.SequenceRunnable
 import ly.img.android.pesdk.utils.UriHelper
 import ly.img.android.sdk.config.*
 import ly.img.android.serializer._3._0._0.PESDKFileReader
@@ -29,6 +30,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.io.File
 
+
 class RNVideoEditorSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), ActivityEventListener, PermissionListener {
     companion object {
         // This number must be unique. It is public to allow client code to change it if the same value is used elsewhere.
@@ -58,49 +60,51 @@ class RNVideoEditorSDKModule(reactContext: ReactApplicationContext) : ReactConte
                         currentPromise?.resolve(null)
                     }
                     Activity.RESULT_OK -> {
-                        val sourcePath = data.getParcelableExtra<Uri>(ImgLyIntent.SOURCE_IMAGE_URI)
-                        val resultPath = data.getParcelableExtra<Uri>(ImgLyIntent.RESULT_IMAGE_URI)
+                        SequenceRunnable("Export Done") {
+                            val sourcePath = data.getParcelableExtra<Uri>(ImgLyIntent.SOURCE_IMAGE_URI)
+                            val resultPath = data.getParcelableExtra<Uri>(ImgLyIntent.RESULT_IMAGE_URI)
 
-                        val serializationConfig = currentConfig?.export?.serialization
-                        val settingsList = data.getParcelableExtra<SettingsList>(ImgLyIntent.SETTINGS_LIST)
+                            val serializationConfig = currentConfig?.export?.serialization
+                            val settingsList = data.getParcelableExtra<SettingsList>(ImgLyIntent.SETTINGS_LIST)
 
-                        val serialization: Any? = if (serializationConfig?.enabled == true) {
-                            skipIfNotExists {
-                                settingsList.let { settingsList ->
-                                    if (serializationConfig.embedSourceImage == true) {
-                                        Log.i("ImgLySdk", "EmbedSourceImage is currently not supported by the Android SDK")
-                                    }
-                                    when (serializationConfig.exportType) {
-                                        SerializationExportType.FILE_URL -> {
-                                            val file = serializationConfig.filename?.let { Export.convertPathToFile(it) }
-                                              ?: File.createTempFile("serialization", ".json")
-                                            PESDKFileWriter(settingsList).writeJson(file)
-                                            file.absolutePath
+                            val serialization: Any? = if (serializationConfig?.enabled == true) {
+                                skipIfNotExists {
+                                    settingsList.let { settingsList ->
+                                        if (serializationConfig.embedSourceImage == true) {
+                                            Log.i("ImgLySdk", "EmbedSourceImage is currently not supported by the Android SDK")
                                         }
-                                        SerializationExportType.OBJECT -> {
-                                            ReactJSON.convertJsonToMap(
-                                              JSONObject(
-                                                PESDKFileWriter(settingsList).writeJsonAsString()
-                                              )
-                                            ) as Any?
+                                        when (serializationConfig.exportType) {
+                                            SerializationExportType.FILE_URL -> {
+                                                val file = serializationConfig.filename?.let { Export.convertPathToFile(it) }
+                                                  ?: File.createTempFile("serialization", ".json")
+                                                PESDKFileWriter(settingsList).writeJson(file)
+                                                Uri.fromFile(file).toString()
+                                            }
+                                            SerializationExportType.OBJECT -> {
+                                                ReactJSON.convertJsonToMap(
+                                                  JSONObject(
+                                                    PESDKFileWriter(settingsList).writeJsonAsString()
+                                                  )
+                                                ) as Any?
+                                            }
                                         }
                                     }
+                                } ?: run {
+                                    Log.i("ImgLySdk", "You need to include 'backend:serializer' Module, to use serialisation!")
+                                    null
                                 }
-                            } ?: run {
-                                Log.i("ImgLySdk", "You need to include 'backend:serializer' Module, to use serialisation!")
+                            } else {
                                 null
                             }
-                        } else {
-                            null
-                        }
 
-                        currentPromise?.resolve(
-                          reactMap(
-                            "image" to resultPath?.toString(),
-                            "hasChanges" to (sourcePath?.path != resultPath?.path),
-                            "serialization" to serialization
-                          )
-                        )
+                            currentPromise?.resolve(
+                              reactMap(
+                                "video" to resultPath?.toString(),
+                                "hasChanges" to (sourcePath?.path != resultPath?.path),
+                                "serialization" to serialization
+                              )
+                            )
+                        }()
                     }
                 }
             }

index.d.ts

@@ -1,6 +1,18 @@
 import { Component } from 'react';
 import { Configuration } from './configuration';
 
+/**
+ * The result of an export.
+ */
+interface VideoEditorResult {
+  /** The edited video. */
+  video: string;
+  /** An indicator whether the input video was modified at all. */
+  hasChanges: boolean;
+  /** All modifications applied to the input video if `export.serialization.enabled` of the `Configuration` was set to `true`. */
+  serialization?: string | object;
+}
+
 declare class VESDK {
   /**
    * Modally present a video editor.
@@ -17,17 +29,14 @@ declare class VESDK {
    * restores a previous state of the editor by re-applying all modifications to the loaded
    * video.
    *
-   * @return {Promise<{video: string, hasChanges: boolean, serialization: object}>} Returns the
-   * edited `video`, an indicator (`hasChanges`) whether the input video was modified at all, and
-   * all modifications (`serialization`) applied to the input video if `export.serialization.enabled`
-   * of the `configuration` was set. If the editor is dismissed without exporting the edited video
-   * `null` is returned instead.
+   * @return {Promise<VideoEditorResult>} Returns a `VideoEditorResult` or `null` if the editor
+   * is dismissed without exporting the edited video.
    */
   static openEditor(
     video: string | {uri: string} | number,
-    configuration: Configuration,
-    serialization: object
-  ): Promise<{image: string, hasChanges: boolean, serialization: object}>
+    configuration?: Configuration,
+    serialization?: object
+  ): Promise<VideoEditorResult>
 
   /**
    * Unlock VideoEditor SDK with a license.
@@ -86,15 +95,11 @@ interface VideoEditorModalProps {
 
   /**
    * This prop determines the callback function that will be called when the user exported a video.
-   *
-   * The object passed to this callback includes the edited `video`, an indicator (`hasChanges`) whether
-   * the input video was modified at all, and all modifications (`serialization`) applied to the input video
-   * if `export.serialization.enabled` of the `configuration` prop was set.
    */
-  onExport: ({video: string, hasChanges: boolean, serialization: object}) => void;
+  onExport: (args: VideoEditorResult) => void;
 
   /**
-   * This prop determines the callback function that will be called when the user dissmisses the editor without
+   * This prop determines the callback function that will be called when the user dismisses the editor without
    * exporting a video.
    */
   onCancel?: () => void;

index.js

@@ -103,11 +103,8 @@ class VESDK {
    * restores a previous state of the editor by re-applying all modifications to the loaded
    * video.
    *
-   * @return {Promise<{video: string, hasChanges: boolean, serialization: object}>} Returns the
-   * edited `video`, an indicator (`hasChanges`) whether the input video was modified at all, and
-   * all modifications (`serialization`) applied to the input video if `export.serialization.enabled`
-   * of the `configuration` was set. If the editor is dismissed without exporting the edited video
-   * `null` is returned instead.
+   * @return {Promise<VideoEditorResult>} Returns a `VideoEditorResult` or `null` if the editor
+   * is dismissed without exporting the edited video.
    */
   static openEditor(video, configuration = null, serialization = null) {
     resolveStaticAssets(configuration)

ios/RNImglyKit.m

@@ -36,7 +36,7 @@ - (void)present:(nonnull IMGLYMediaEditViewControllerBlock)createMediaEditViewCo
 #if RN_IMGLY_DEBUG
   {
     // For release debugging
-    NSURL *debugURL = [RCTConvert IMGLYExportFileURL:@"imgly-debug" withExpectedUTI:kUTTypeJSON];
+    NSURL *debugURL = [RCTConvert RN_IMGLY_ExportFileURL:@"imgly-debug" withExpectedUTI:kUTTypeJSON];
     if (debugURL) {
       NSError *error = nil;
       NSJSONWritingOptions debugOptions = NSJSONWritingPrettyPrinted;
@@ -106,7 +106,10 @@ - (void)present:(nonnull IMGLYMediaEditViewControllerBlock)createMediaEditViewCo
 
     // Update configuration
     NSMutableDictionary *updatedDictionary = [NSMutableDictionary dictionaryWithDictionary:dictionary];
-    [updatedDictionary setValue:exportFile.absoluteString forKeyPath:@"export.filename"];
+    NSMutableDictionary *exportDictionary = [NSMutableDictionary dictionaryWithDictionary:[NSDictionary RN_IMGLY_dictionary:updatedDictionary valueForKeyPath:@"export" default:@{}]];
+    [exportDictionary setValue:exportFile.absoluteString forKeyPath:@"filename"];
+    [updatedDictionary setValue:exportDictionary forKeyPath:@"export"];
+
     configuration = [[PESDKConfiguration alloc] initWithBuilder:^(PESDKConfigurationBuilder * _Nonnull builder) {
       builder.assetCatalog = assetCatalog;
       [builder configureFromDictionary:updatedDictionary error:&error];

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-videoeditorsdk",
   "title": "React Native module for VideoEditor SDK",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "A React Native module for VideoEditor SDK. Integrate the video editor into your own HTML5, iOS or Android app - in minutes!",
   "main": "index.js",
   "typings": "index.d.ts",