react-native-scanbot-barcode-scanner-sdk 3.7.0 → 3.7.1-beta.2

package/RNScanbotBarcodeSDK.podspec

@@ -1,24 +1,27 @@
+# AUTOGENERATED: DO NOT MODIFY MANUALLY 
+
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-ScanbotBarcodeScannerSDKVersion = '3.7.0'
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+ScanbotBarcodeScannerSDKVersion = '4.0.0'
 
 Pod::Spec.new do |s|
   s.name         = "RNScanbotBarcodeSDK"
-  s.version           = package['version']
-  s.summary           = package['description']
-  s.homepage          = package['homepage']
-  s.authors           = package['author']
+  s.version      = package['version']
+  s.summary      = package['description']
+  s.homepage     = package['homepage']
+  s.authors      = package['author']
   s.license      = { :type => 'Commercial' }
   s.platforms    = { :ios => "13.0" }
-  s.source       = { :http => 'https://download.scanbot.io/barcode-scanner-sdk/react-native/react-native-scanbot-barcode-scanner-sdk-' + package['version'] + '.tgz' }
 
-  s.source_files = "ios/**/*.{h,m,swift}"
+  
+  s.source = { :http => 'https://download.scanbot.io/barcode-scanner-sdk/react-native/react-native-scanbot-barcode-scanner-sdk-' + package['version'] + '.tgz' }    
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.requires_arc = true
 
+  install_modules_dependencies(s)
+
   s.dependency "React"
   s.dependency "ScanbotBarcodeScannerSDK", ScanbotBarcodeScannerSDKVersion
 

package/android/build.gradle

@@ -4,27 +4,30 @@ def DEFAULT_COMPILE_SDK_VERSION = 31
 def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 31
 
-def sdkVersion = '3.7.0'
+def sdkVersion = '4.0.0'
 
-buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
-    }
+def isNewArchitectureEnabled = {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
-apply plugin: 'com.android.library'
-
-def safeExtGet(prop, fallback) {
+buildscript {
+  ext.safeExtGet = {prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  }
+  repositories {
+    google()
+    gradlePluginPortal()
+    jcenter()
+    mavenCentral()
+  }
+  dependencies {
+    classpath("com.android.tools.build:gradle:7.3.1")
+  }
 }
 
+apply plugin: 'com.android.library'
+apply plugin: 'com.facebook.react'
+
 android {
     compileSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     defaultConfig {
@@ -32,6 +35,17 @@ android {
         targetSdkVersion safeExtGet('ScanbotBarcodeScannerSdk_targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
         versionCode 1
         versionName "1.0"
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
+    }
+
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/main', 'src/new-architecture']
+            } else {
+                java.srcDirs += ['src/main', 'src/old-architecture']
+            }
+        }
     }
 
     buildTypes {
@@ -43,21 +57,12 @@ android {
     lintOptions {
         disable 'GradleCompatible'
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 repositories {
     mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    google()
     mavenCentral()
+    google()
     jcenter()
 
     // Scanbot SDK Maven Repositories (NEXUS)
@@ -70,8 +75,7 @@ repositories {
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion
-    implementation 'com.facebook.react:react-native:+'  // From node_modules
+    implementation 'com.facebook.react:react-native'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.scanbot.barcodesdk.plugin.reactnative">
+<manifest package="io.scanbot.barcodesdk.plugin.reactnative">
 
 </manifest>

package/android/src/main/java/com/reactlibrary/ScanbotBarcodeSdkModule.java

@@ -1,24 +1,17 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package com.reactlibrary;
 
-import com.facebook.react.bridge.ReactApplicationContext;
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
 
+/** @noinspection unused*/
 public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule {
-
-    private final ReactApplicationContext reactContext;
-
-    public ScanbotBarcodeSdkModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
-
+    @NonNull
     @Override
     public String getName() {
         return "ScanbotBarcodeSdk";

package/android/src/main/java/com/reactlibrary/ScanbotBarcodeSdkPackage.java

@@ -1,13 +1,12 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package com.reactlibrary;
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -19,6 +18,7 @@ import com.facebook.react.uimanager.ViewManager;
 import io.scanbot.barcodesdk.plugin.reactnative.ScanbotBarcodeSdkModule;
 import io.scanbot.barcodesdk.plugin.reactnative.components.barcodecameraview.ScanbotBarcodeCameraViewManager;
 
+/** @noinspection unused*/
 public class ScanbotBarcodeSdkPackage implements ReactPackage {
     @NonNull
     @Override

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ObjectMapper.java

@@ -1,12 +1,11 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
 
 import android.graphics.Color;
-import android.util.Log;
 
 import com.facebook.react.bridge.ReadableMap;
 
@@ -15,11 +14,10 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import io.scanbot.barcodesdk.plugin.reactnative.utils.LogUtils;
-import io.scanbot.sdk.ui.camera.FinderAspectRatio;
+import io.scanbot.sdk.AspectRatio;
 
 public final class ObjectMapper {
-    private static Map<String, Map<String, Method>> methodCache = new HashMap<>();
+    private static final Map<String, Map<String, Method>> methodCache = new HashMap<>();
 
     private static Map<String, Map<String, String>> enumMappings;
 
@@ -47,7 +45,7 @@ public final class ObjectMapper {
         ObjectMapper.enumMappings = enumMappings;
     }
 
-    @SuppressWarnings({"unchecked", "SuspiciousMethodCalls", "rawtypes", "ConstantConditions"})
+    @SuppressWarnings({"unchecked", "SuspiciousMethodCalls", "rawtypes"})
     private static void map(final Map<String, Object> source, final Object target)
             throws IllegalAccessException, InvocationTargetException {
         final Class cls = target.getClass();
@@ -102,22 +100,31 @@ public final class ObjectMapper {
 
                 if (enumMappings != null && enumMappings.containsKey(prop)) {
                     Map<String, String> enumNames = enumMappings.get(prop);
-                    if (enumNames.containsKey(value)) {
+                    if (enumNames != null && enumNames.containsKey(value)) {
                         value = enumNames.get(value);
                     }
                 }
 
                 if (setterName.equals("setFinderAspectRatio")) {
-                    Map<String, Object> pointMap = (Map<String, Object>) value;
-                    int x = ((Number) pointMap.get("width")).intValue();
-                    int y = ((Number) pointMap.get("height")).intValue();
-                    setter.invoke(target, new FinderAspectRatio(x, y));
+                    final Map<String, Object> pointMap = (Map<String, Object>) value;
+                    if (pointMap != null) {
+                        final Object widthObj = pointMap.get("width");
+                        final Object heightObj = pointMap.get("width");
+                        if (widthObj != null && heightObj != null) {
+                            int x = ((Number) widthObj).intValue();
+                            int y = ((Number) heightObj).intValue();
+                            setter.invoke(target, new AspectRatio(x, y));
+                        }
+                    }
                 } else if (setter.getParameterTypes().length == 2 && value instanceof Map) {
-                    // map Size to a binary function
-                    Map<String, Object> pointMap = (Map<String, Object>) value;
-                    int x = ((Number) pointMap.get("width")).intValue();
-                    int y = ((Number) pointMap.get("height")).intValue();
-                    setter.invoke(target, x, y);
+                    final Map<String, Object> pointMap = (Map<String, Object>) value;
+                    final Object widthObj = pointMap.get("width");
+                    final Object heightObj = pointMap.get("width");
+                    if (widthObj != null && heightObj != null) {
+                        int x = ((Number) widthObj).intValue();
+                        int y = ((Number) heightObj).intValue();
+                        setter.invoke(target, new AspectRatio(x, y));
+                    }
                 } else {
                     final Class paramType = setter.getParameterTypes()[0];
                     if (setterName.contains("Color")) {
@@ -134,7 +141,7 @@ public final class ObjectMapper {
                     } else if (paramType == long.class) {
                         assert value instanceof Number;
                         value = ((Number) value).longValue();
-                    } else if (paramType.isEnum()) {
+                    } else if (paramType.isEnum() && value != null) {
                         try {
                             value = Enum.valueOf(paramType, (String) value);
                         } catch (final Exception ignored) {

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkConfiguration.java

@@ -1,16 +1,19 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
 
+// The following noinspection rule has been introduced since
+// methods in this class are called through reflection
+/** @noinspection unused*/
 public class ScanbotBarcodeSdkConfiguration {
     private boolean loggingEnabled = false;
     private boolean enableNativeLogging = false;
     private String licenseKey;
     private String storageBaseDirectory = null;
-    private boolean useCameraX = false;
+    private boolean useCameraX = true;
     private boolean allowXnnpackAcceleration = true;
     private boolean allowGpuAcceleration = true;
 

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkModule.java

@@ -1,6 +1,6 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
@@ -18,15 +18,11 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONArray;
-import org.json.JSONException;
 
 import java.io.File;
 import java.io.IOException;
@@ -47,7 +43,6 @@ import io.scanbot.sdk.barcode.entity.BarcodeDocumentFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeFormat;
 import io.scanbot.sdk.barcode.entity.BarcodeItem;
 import io.scanbot.sdk.barcode.entity.BarcodeScanningResult;
-import io.scanbot.sdk.barcode.entity.EngineMode;
 import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDK;
 import io.scanbot.sdk.barcode_scanner.ScanbotBarcodeScannerSDKInitializer;
 import io.scanbot.sdk.camera.ZoomRange;
@@ -60,10 +55,11 @@ import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerAdditionalConf
 import io.scanbot.sdk.ui.view.barcode.configuration.BarcodeScannerConfiguration;
 import io.scanbot.sdk.ui.view.barcode.common.configuration.CommonBarcodeScannerConfiguration;
 import io.scanbot.sdk.ui.view.base.configuration.CameraOrientationMode;
-import kotlin.Unit;
 
 import android.app.Activity;
 
+import androidx.annotation.NonNull;
+
 
 public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implements ActivityEventListener {
 
@@ -71,7 +67,6 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
     private static final String LOG_TAG = ScanbotBarcodeSdkModule.class.getSimpleName();
 
     private final ExecutorService threadPool;
-    private final ReactApplicationContext reactContext;
 
     private static boolean isSdkInitialized;
 
@@ -79,7 +74,6 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
 
     public ScanbotBarcodeSdkModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        this.reactContext = reactContext;
         this.threadPool = Executors.newCachedThreadPool();
 
         Map<String, Map<String, String>> enumMappings = new HashMap<>();
@@ -93,67 +87,78 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         reactContext.addActivityEventListener(this);
     }
 
+    @NonNull
     @Override
     public String getName() {
         return "ScanbotBarcodeSdk";
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void initializeSdk(final ReadableMap options, final Promise promise) {
         debugLog("Initializing Scanbot SDK ...");
-        this.threadPool.execute(new Runnable() {
-            public void run() {
-                try {
-                    final ScanbotBarcodeSdkConfiguration configuration = new ScanbotBarcodeSdkConfiguration();
-                    safeMap(options, configuration, promise);
-
-                    final Application app = getCurrentActivity().getApplication();
-                    final String callbackMessage;
-
-                    final ScanbotBarcodeScannerSDKInitializer initializer = new ScanbotBarcodeScannerSDKInitializer();
-                    initializer.withLogging(configuration.isLoggingEnabled(), configuration.getEnableNativeLogging());
-                    LogUtils.setLoggingEnabled(configuration.isLoggingEnabled());
-
-                    initializer.allowGpuAcceleration(configuration.getAllowGpuAcceleration());
-                    initializer.allowXnnpackAcceleration(configuration.getAllowXnnpackAcceleration());
-                    initializer.useCameraXRtuUi(configuration.getUseCameraX());
-
-                    if (configuration.getStorageBaseDirectory() != null && !"".equals(configuration.getStorageBaseDirectory())) {
-                        final Uri uri = Uri.parse(configuration.getStorageBaseDirectory());
-                        final File customStorageBaseDirectory = new File(uri.getPath());
-                        customStorageBaseDirectory.mkdirs();
-                        if (!customStorageBaseDirectory.isDirectory()) {
-                            throw new IOException("Specified storageBaseDirectory is not valid: " + uri);
-                        }
-                        initializer.sdkFilesDirectory(app, customStorageBaseDirectory);
-                        StorageUtils.setCustomStorageBaseDirectory(customStorageBaseDirectory);
-                        debugLog("Using custom storage base directory: " + customStorageBaseDirectory.getAbsolutePath());
-                    }
+        this.threadPool.execute(() -> {
+            try {
+                final ScanbotBarcodeSdkConfiguration configuration = new ScanbotBarcodeSdkConfiguration();
+                safeMap(options, configuration, promise);
 
-                    final String licenseKey = configuration.getLicenseKey();
-                    if (licenseKey != null && !"".equals(licenseKey.trim()) && !"null".equals(licenseKey.toLowerCase())) {
-                        initializer.license(app, licenseKey);
-                        callbackMessage = "Scanbot SDK initialized.";
-                    } else {
-                        callbackMessage = "Scanbot SDK initialized. Trial mode activated. You can now test all features for 60 seconds.";
-                    }
+                final Activity activity = getCurrentActivity();
+                if (activity == null) {
+                    throw new RuntimeException("Cannot get current activity");
+                }
 
-                    debugLog("Checking license ...");
-                    SdkLicenseInfo licenseInfo = initializer.initialize(app);
+                final Application application = activity.getApplication();
+                final String callbackMessage;
 
-                    if (licenseInfo.isValid()) {
-                        isSdkInitialized = true;
-                        ResponseUtils.successMessageJson(callbackMessage, promise);
-                    } else {
-                        ResponseUtils.errorMessageJson(descriptionFromLicenseStatus(licenseInfo.getStatus()), promise);
+                final ScanbotBarcodeScannerSDKInitializer initializer = new ScanbotBarcodeScannerSDKInitializer();
+                initializer.withLogging(configuration.isLoggingEnabled(), configuration.getEnableNativeLogging());
+                LogUtils.setLoggingEnabled(configuration.isLoggingEnabled());
+
+                initializer.allowGpuAcceleration(configuration.getAllowGpuAcceleration());
+                initializer.allowXnnpackAcceleration(configuration.getAllowXnnpackAcceleration());
+                initializer.useCameraXRtuUi(configuration.getUseCameraX());
+
+                if (configuration.getStorageBaseDirectory() != null && !"".equals(configuration.getStorageBaseDirectory())) {
+                    final Uri uri = Uri.parse(configuration.getStorageBaseDirectory());
+                    final String path = uri.getPath();
+                    if (path == null) {
+                        throw new IOException("Cannot get path from uri: " + uri);
                     }
-                } catch (Exception ex) {
-                    promise.reject(ex);
+                    final File customStorageBaseDirectory = new File(path);
+                    boolean ignoredMkdirs = customStorageBaseDirectory.mkdirs();
+                    if (!customStorageBaseDirectory.isDirectory()) {
+                        throw new IOException("Specified storageBaseDirectory is not valid: " + uri);
+                    }
+
+                    initializer.sdkFilesDirectory(application, customStorageBaseDirectory);
+                    StorageUtils.setCustomStorageBaseDirectory(customStorageBaseDirectory);
+                    debugLog("Using custom storage base directory: " + customStorageBaseDirectory.getAbsolutePath());
+                }
+
+                final String licenseKey = configuration.getLicenseKey();
+                if (licenseKey != null && !"".equals(licenseKey.trim()) && !"null".equalsIgnoreCase(licenseKey)) {
+                    initializer.license(application, licenseKey);
+                    callbackMessage = "Scanbot SDK initialized.";
+                } else {
+                    callbackMessage = "Scanbot SDK initialized. Trial mode activated. You can now test all features for 60 seconds.";
+                }
+
+                debugLog("Checking license ...");
+                SdkLicenseInfo licenseInfo = initializer.initialize(application);
+
+                if (licenseInfo.isValid()) {
+                    isSdkInitialized = true;
+                    ResponseUtils.successMessageJson(callbackMessage, promise);
+                } else {
+                    ResponseUtils.errorMessageJson(descriptionFromLicenseStatus(licenseInfo.getStatus()), promise);
                 }
+            } catch (Exception ex) {
+                promise.reject(ex);
             }
         });
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void getLicenseInfo(final Promise promise) {
         if (rejectIfUninitialized(promise)) {
@@ -172,6 +177,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         }
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void detectBarcodesOnImage(final ReadableMap options, final Promise promise) {
         if (rejectIfUninitialized(promise)) {
@@ -215,6 +221,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         });
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void startBarcodeScanner(final ReadableMap options, final Promise promise) {
         if (rejectIfUninitialized(promise)) {
@@ -230,15 +237,22 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
             
             this.setCustomBarcodeScannerConfiguration(options, configuration);
 
-            final Intent intent = BarcodeScannerActivity.newIntent(this.getReactApplicationContext(), configuration);
+            // Setup activity result callback
             activityCallbackPromise = promise;
             context.addActivityEventListener(this);
+
+            // TODO: Migrate to Results API
+            final Intent intent = BarcodeScannerActivity.newIntent(
+                this.getReactApplicationContext(),
+                configuration
+            );
             context.startActivityForResult(intent, REQUEST_SB_BARCODE_SCANNER, null);
         } catch (final Exception e) {
             promise.reject("Error starting barcode scanner.", e);
         }
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void closeBarcodeScanner(final Promise promise) {
         final ReactContext context = getReactApplicationContext();
@@ -246,6 +260,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         promise.resolve(null);
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void startBatchBarcodeScanner(ReadableMap configuration, final Promise promise) {
         final ReactContext context = getReactApplicationContext();
@@ -257,11 +272,13 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
 
             this.setCustomBarcodeScannerConfiguration(configuration, nativeConfig);
 
-            Intent startIntent = BatchBarcodeScannerActivity.newIntent(context, nativeConfig, null);
-
+            // Setup activity result callback
             activityCallbackPromise = promise;
             context.addActivityEventListener(this);
-            context.startActivityForResult(startIntent, REQUEST_SB_BARCODE_SCANNER, null);
+
+            // TODO: Migrate to Results API
+            final Intent intent = BatchBarcodeScannerActivity.newIntent(context, nativeConfig, null);
+            context.startActivityForResult(intent, REQUEST_SB_BARCODE_SCANNER, null);
         } catch (Exception ex) {
             promise.reject(ex);
         }
@@ -319,6 +336,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         configuration.setCameraPreviewMode(JSONUtils.extractCameraPreviewMode(options));
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void closeBatchBarcodeScanner(final Promise promise) {
         final ReactContext context = getReactApplicationContext();
@@ -326,25 +344,24 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         promise.resolve(null);
     }
 
+    /** @noinspection unused*/
     @ReactMethod
     public void cleanup(final Promise promise) {
         if (rejectIfUninitialized(promise)) {
             return;
         }
-        threadPool.execute(new Runnable() {
-            public void run() {
-                try {
-
-                    debugLog("Cleaning Barcode SDK storage folder ...");
-                    ScanbotBarcodeScannerSDK sdk = new ScanbotBarcodeScannerSDK(getReactApplicationContext());
-                    sdk.createBarcodeFileStorage().cleanupBarcodeImagesDirectory();
-
-                    debugLog("Cleaning plugin storage folder ...");
-                    StorageUtils.cleanupPluginStorageDirectory(getReactApplicationContext());
-                    ResponseUtils.successMessageJson("Cleanup successfully done.", promise);
-                } catch (final Exception e) {
-                    ResponseUtils.errorMessageJson(e.getLocalizedMessage(), promise);
-                }
+        threadPool.execute(() -> {
+            try {
+
+                debugLog("Cleaning Barcode SDK storage folder ...");
+                ScanbotBarcodeScannerSDK sdk = new ScanbotBarcodeScannerSDK(getReactApplicationContext());
+                sdk.createBarcodeFileStorage().cleanupBarcodeImagesDirectory();
+
+                debugLog("Cleaning plugin storage folder ...");
+                StorageUtils.cleanupPluginStorageDirectory(getReactApplicationContext());
+                ResponseUtils.successMessageJson("Cleanup successfully done.", promise);
+            } catch (final Exception e) {
+                ResponseUtils.errorMessageJson(e.getLocalizedMessage(), promise);
             }
         });
     }
@@ -353,19 +370,13 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent intent) {
         debugLog("onActivityResult: requestCode=" + requestCode + ", resultCode=" + resultCode + ", intent=" + intent);
 
-        switch (requestCode) {
-            case REQUEST_SB_BARCODE_SCANNER:
-                this.handleBarcodeScannerActivityCompletion(intent, resultCode);
-                return;
-
-            default:
-                return;
+        if (requestCode == REQUEST_SB_BARCODE_SCANNER) {
+            this.handleBarcodeScannerActivityCompletion(intent, resultCode);
         }
     }
 
     @Override
-    public void onNewIntent(Intent intent) {
-    }
+    public void onNewIntent(Intent intent) {}
 
     private void handleBarcodeScannerActivityCompletion(final Intent intent, final int resultCode) {
         Promise promise = this.activityCallbackPromise;
@@ -376,10 +387,7 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
         if (barcodeResult.getResultOk()) {
             final WritableMap result = JSONUtils.jsonResultFromBarcodeResult(barcodeResult.getResult());
 
-            String imagePath = intent.getStringExtra(BarcodeScannerActivity.SCANNED_BARCODE_IMAGE_PATH_EXTRA);
-            if (imagePath == null) {
-                imagePath = intent.getStringExtra(BarcodeScannerActivity.SCANNED_BARCODE_PREVIEW_FRAME_PATH_EXTRA);
-            }
+            final String imagePath = barcodeResult.getBarcodeImagePath();
             if (imagePath != null) {
                 result.putString("imageFileUri", "file://" + imagePath);
             }

package/android/src/main/java/io/scanbot/barcodesdk/plugin/reactnative/ScanbotBarcodeSdkPackage.java

@@ -1,13 +1,12 @@
 /*
   Scanbot Barcode Scanner SDK React Native Plugin
-  Copyright (c) 2020 doo GmbH. All rights reserved.
+  Copyright (c) 2023 Scanbot SDK GmbH. All rights reserved.
   https://scanbot.io/sdk
  */
 package io.scanbot.barcodesdk.plugin.reactnative;
 
 import androidx.annotation.NonNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;