Add version 2.6.0

Author: Niklas Bachmann

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.6.0]
+
+### Fixed
+
+* Support for Android version 8.0.4 upwards.
+
+## Changed
+
+* Minimal version 8.0.4.
+
 ## [2.5.0]
 
 ### Removed

README.md

@@ -82,12 +82,12 @@ For older React Native versions autolinking is not available and PhotoEditor SDK
            maven { url "https://artifactory.img.ly/artifactory/imgly" }
        }
        dependencies {
-           classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
-           classpath 'ly.img.android.sdk:plugin:7.6.0'
+           classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
+           classpath 'ly.img.android.sdk:plugin:8.0.4'
        }
    }
    ```
-   In order to update PhotoEditor SDK for Android replace the version string `7.6.0` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
+   In order to update PhotoEditor SDK for Android replace the version string `8.0.4` with a [newer release](https://github.com/imgly/pesdk-android-demo/releases).
 
 3. Configure PhotoEditor 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/build.gradle

@@ -20,16 +20,16 @@ imglyConfig {
     }
 }
 
-def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "7.6.0"
+def MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION = "8.0.4"
 
 task checkVersion {
     if (imglyConfig.convertToVersionNumber(imglyConfig.getVersion()) < imglyConfig.convertToVersionNumber(MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION)) {
         String WRONG_VERSION = "" +
             "┌───────────────────────────────────────────────────────────────────────┐\n"+
             "│ PhotoEditor SDK update required!                                      │\n"+
             "│ Please update the plugin version in your 'android/build.gradle' file. │\n"+
-            "│ Minimum required dependency: 'ly.img.android.sdk:plugin:${MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION}'       │\n"+
-            "│ Your are currently using:    'ly.img.android.sdk:plugin:${imglyConfig.getVersion()}'       │\n"+
+            "│ Minimum required dependency: 'ly.img.android.sdk:plugin:${MIN_LY_IMG_ANDROID_SDK_PLUGIN_VERSION}'        │\n"+
+            "│ Your are currently using:    'ly.img.android.sdk:plugin:${imglyConfig.getVersion()}'        │\n"+
             "└───────────────────────────────────────────────────────────────────────┘\n"
 
         throw new GradleScriptException(WRONG_VERSION, new IllegalArgumentException(WRONG_VERSION))

android/src/main/java/ly/img/react_native/pesdk/RNPhotoEditorSDKModule.kt

@@ -23,12 +23,14 @@ 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
-import ly.img.android.serializer._3._0._0.PESDKFileWriter
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.File
+import ly.img.android.pesdk.backend.encoder.Encoder
+import ly.img.android.serializer._3.IMGLYFileReader
+import ly.img.android.serializer._3.IMGLYFileWriter
+
 
 
 class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), ActivityEventListener, PermissionListener {
@@ -77,15 +79,18 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
                                         }
                                         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()
+                                                val uri = serializationConfig.filename?.let { 
+                                                    Uri.parse(it)
+                                                } ?: Uri.fromFile(File.createTempFile("serialization", ".json"))
+                                                Encoder.createOutputStream(uri).use { outputStream -> 
+                                                    IMGLYFileWriter(settingsList).writeJson(outputStream);
+                                                }
+                                                uri.toString()
                                             }
                                             SerializationExportType.OBJECT -> {
                                                 ReactJSON.convertJsonToMap(
                                                   JSONObject(
-                                                    PESDKFileWriter(settingsList).writeJsonAsString()
+                                                    IMGLYFileWriter(settingsList).writeJsonAsString()
                                                   )
                                                 ) as Any?
                                             }
@@ -139,18 +144,16 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
         settingsList.configure<LoadSettings> { loadSettings ->
             image?.also {
                 if (it.startsWith("data:")) {
-                    loadSettings.setSource(UriHelper.createFromBase64String(it.substringAfter("base64,")), deleteProtectedSource = false)
+                    loadSettings.source = UriHelper.createFromBase64String(it.substringAfter("base64,"))
                 } else {
                     val potentialFile = continueWithExceptions { File(it) }
                     if (potentialFile?.exists() == true) {
-                        loadSettings.setSource(Uri.fromFile(potentialFile), deleteProtectedSource = true)
+                        loadSettings.source = Uri.fromFile(potentialFile)
                     } else {
-                        loadSettings.setSource(ConfigLoader.parseUri(it), deleteProtectedSource = true)
+                        loadSettings.source = ConfigLoader.parseUri(it)
                     }
                 }
             }
-        }.configure<SaveSettings> {
-            it.savePolicy = SaveSettings.SavePolicy.RETURN_SOURCE_OR_CREATE_OUTPUT_IF_NECESSARY
         }
 
         readSerialisation(settingsList, serialization, image == null)
@@ -180,14 +183,15 @@ class RNPhotoEditorSDKModule(val reactContext: ReactApplicationContext) : ReactC
     private fun readSerialisation(settingsList: SettingsList, serialization: String?, readImage: Boolean) {
         if (serialization != null) {
             skipIfNotExists {
-                PESDKFileReader(settingsList).also {
+                IMGLYFileReader(settingsList).also {
                     it.readJson(serialization, readImage)
                 }
             }
         }
     }
 
     private fun startEditor(settingsList: PhotoEditorSettingsList?) {
+        val currentActivity = this.currentActivity ?: throw RuntimeException("Can't start the Editor because there is no current activity")
         if (settingsList != null) {
             (currentActivity as? PermissionAwareActivity)?.also {
                 for (permission in PermissionRequest.NEEDED_EDITOR_PERMISSIONS) {

package.json

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