react-native-scanbot-barcode-scanner-sdk 4.0.0 → 4.0.1-beta.1

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

@@ -27,6 +27,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -161,16 +162,18 @@ public class ScanbotBarcodeSdkModule extends ReactContextBaseJavaModule implemen
     /** @noinspection unused*/
     @ReactMethod
     public void getLicenseInfo(final Promise promise) {
-        if (rejectIfUninitialized(promise)) {
-            return;
-        }
         try {
-            WritableMap result = Arguments.createMap();
-            ScanbotBarcodeScannerSDK sdk = new ScanbotBarcodeScannerSDK(getReactApplicationContext());
-            SdkLicenseInfo licenseInfo = sdk.getLicenseInfo();
+            final WritableMap result = Arguments.createMap();
+            final ScanbotBarcodeScannerSDK sdk = new ScanbotBarcodeScannerSDK(getReactApplicationContext());
+            final SdkLicenseInfo licenseInfo = sdk.getLicenseInfo();
             result.putBoolean("isLicenseValid", licenseInfo.isValid());
             result.putString("licenseStatus", licenseInfo.getStatus().name());
             result.putString("licenseStatusMessage", descriptionFromLicenseStatus(licenseInfo.getStatus()));
+
+            final Date expirationDate = licenseInfo.getExpirationDate();
+            if (expirationDate != null) {
+                result.putDouble("licenseExpirationDate", expirationDate.getTime());
+            }
             promise.resolve(result);
         } catch (Exception ex) {
             promise.reject(ex);

package/index.d.ts

@@ -1,7 +1,7 @@
 import { InitializationOptions } from "./src/model";
 import { BarcodeScannerConfiguration, BatchBarcodeScannerConfiguration, DetectBarcodesOnImageArguments } from "./src/configuration";
 import { BarcodeDocumentFormat, BarcodeFormat, EngineMode } from "./src/enum";
-import { BarcodeResult, BarcodeScannerResult, BatchBarcodeScannerResult } from "./src/result";
+import { BarcodeResult, BarcodeScannerResult, BatchBarcodeScannerResult, GetLicenseInfoResult } from "./src/result";
 import { ScanbotBarcodeCameraView } from "./src/components/barcode-camera-view/scanbot-barcode-camera-view";
 import { ScanbotBarcodeCameraViewConfiguration} from "./src/components/barcode-camera-view/scanbot-barcode-camera-view-types";
 
@@ -15,13 +15,15 @@ export {
     BatchBarcodeScannerResult,
     ScanbotBarcodeCameraView,
     ScanbotBarcodeCameraViewConfiguration,
-    EngineMode
+    EngineMode,
+    GetLicenseInfoResult
 }
 
 export interface ScanbotBarcodeSdk {
     // SDK Internal
     initializeSdk(options: InitializationOptions): Promise<{ result: string }>;
-    getLicenseInfo(): Promise<any>;
+    getLicenseInfo(): Promise<GetLicenseInfoResult>;
+
     cleanup(): Promise<void>;
 
     // RTU-UI Barcode Scanning

package/ios/ScanbotBarcodeSdk.m

@@ -22,9 +22,13 @@ void runInBackground(void (^function)(void)) {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), function);
 }
 
-@implementation ScanbotBarcodeSdk
+@interface ScanbotBarcodeSdk()
+@property(nonatomic, strong) BatchBarcodeScannerPromiseProxy *barcodeBatchProxy;
+@property(nonatomic, strong) BarcodeScannerPromiseProxy *barcodeProxy;
+@property(nonatomic, strong) UIViewController *activeViewController;
+@end
 
-static UIViewController* activeViewController = nil;
+@implementation ScanbotBarcodeSdk
 
 RCT_EXPORT_MODULE()
 
@@ -104,15 +108,19 @@ RCT_EXPORT_METHOD(initializeSdk:(NSDictionary *)configuration
 RCT_EXPORT_METHOD(getLicenseInfo:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-    if (![self checkSDKInitialization:reject]) {
-        return;
-    }
-
-    resolve(@{
+    NSMutableDictionary* result = [[NSMutableDictionary alloc] initWithDictionary:@{
         @"isLicenseValid": @(Scanbot.isLicenseValid),
         @"licenseStatus": [ScanbotBarcodeSdk stringFromLicenseStatus:Scanbot.licenseStatus],
-        @"licenseStatusMessage": [ScanbotBarcodeSdk descriptionFromLicenseStatus:Scanbot.licenseStatus]
-    });
+        @"licenseStatusMessage": [ScanbotBarcodeSdk descriptionFromLicenseStatus:Scanbot.licenseStatus],
+    }];
+    
+    
+    NSDate* expirationDate = [Scanbot licenseExpirationDate];
+    if (expirationDate) {
+        [result setValue:@(expirationDate.timeIntervalSince1970 * 1000) forKey:@"licenseExpirationDate"];
+    }
+    
+    resolve(result);
 }
 
 RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
@@ -166,17 +174,22 @@ RCT_EXPORT_METHOD(startBarcodeScanner:(NSDictionary*)configuration
     }
 
     bool shouldWaitForGeneratedImage = behaviorConfig.barcodeImageGenerationType != SBSDKBarcodeImageGenerationTypeNone;
-    BarcodeScannerPromiseProxy* delegate = [[BarcodeScannerPromiseProxy alloc] initWithResolver: resolve
-                                                                      shouldIncludeBarcodeImage: shouldWaitForGeneratedImage];
     
-    SBSDKUIBarcodeScannerViewController* viewController = [SBSDKUIBarcodeScannerViewController createNewWithConfiguration:barcodeScannerConfiguration andDelegate:delegate];
-    [self presentActiveViewController:viewController];
-}
+    __weak ScanbotBarcodeSdk *weakSelf = self;
+    RCTPromiseResolveBlock proxyResolve = ^(NSDictionary* result){
+        weakSelf.activeViewController = nil;
+        resolve(result);
+    };
 
-RCT_EXPORT_METHOD(closeBarcodeScanner:(RCTPromiseResolveBlock)resolve
-                  failure:(RCTPromiseRejectBlock)reject) {
-    [self dismissActiveViewController: [SBSDKUIBarcodeScannerViewController class]];
-    resolve(nil);
+    self.barcodeProxy = [[BarcodeScannerPromiseProxy alloc] initWithResolver: proxyResolve
+                                                   shouldIncludeBarcodeImage: shouldWaitForGeneratedImage];
+    
+    SBSDKUIBarcodeScannerViewController* viewController = [SBSDKUIBarcodeScannerViewController createNewWithConfiguration:barcodeScannerConfiguration
+                                                                                                              andDelegate:self.barcodeProxy];
+    
+    self.activeViewController = viewController;
+
+    [self presentActiveViewController];
 }
 
 RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
@@ -229,18 +242,30 @@ RCT_EXPORT_METHOD(startBatchBarcodeScanner:(NSDictionary*)configuration
         batchBarcodeConfig.cameraConfiguration.camera = cameraConfiguration.camera;
     }
 
-    BatchBarcodeScannerPromiseProxy* delegate = [[BatchBarcodeScannerPromiseProxy alloc] initWithResolver:resolve];
-
+    __weak ScanbotBarcodeSdk *weakSelf = self;
+    RCTPromiseResolveBlock proxyResolve = ^(NSDictionary* result){
+        weakSelf.activeViewController = nil;
+        resolve(result);
+    };
+    
+    self.barcodeBatchProxy = [[BatchBarcodeScannerPromiseProxy alloc] initWithResolver:proxyResolve];
+    
     SBSDKUIBarcodesBatchScannerViewController* viewController = [SBSDKUIBarcodesBatchScannerViewController
                                                                  createNewWithConfiguration:batchBarcodeConfig
-                                                                 andDelegate:delegate];
-    [self presentActiveViewController:viewController];
+                                                                 andDelegate:self.barcodeBatchProxy];
+    
+    self.activeViewController = viewController;
+    [self presentActiveViewController];
+}
+
+RCT_EXPORT_METHOD(closeBarcodeScanner:(RCTPromiseResolveBlock)resolve
+                  failure:(RCTPromiseRejectBlock)reject) {
+    [self closeActiveViewControllerWithResolveBlock: resolve];
 }
 
 RCT_EXPORT_METHOD(closeBatchBarcodeScanner:(RCTPromiseResolveBlock)resolve
                   failure:(RCTPromiseRejectBlock)reject) {
-    [self dismissActiveViewController: [SBSDKUIBarcodesBatchScannerViewController class]];
-    resolve(nil);
+    [self closeActiveViewControllerWithResolveBlock: resolve];
 }
 
 RCT_EXPORT_METHOD(detectBarcodesOnImage:(NSDictionary *)configuration
@@ -314,6 +339,13 @@ RCT_EXPORT_METHOD(cleanup:(RCTPromiseResolveBlock)resolve
     });
 }
 
+- (void)closeActiveViewControllerWithResolveBlock:(RCTPromiseResolveBlock)resolve {
+    [self dismissActiveViewController];
+    if (resolve != nil) {
+        resolve(nil);
+    }
+}
+
 - (void)reportSuccessWithMessage:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve {
     resolve(@{
         @"status": @"OK",
@@ -394,55 +426,45 @@ RCT_EXPORT_METHOD(cleanup:(RCTPromiseResolveBlock)resolve
     return nil;
 }
 
-- (void) presentActiveViewController:(UIViewController*) viewController {
-    if (!viewController) {
+- (void)presentActiveViewController {
+    if (self.activeViewController == nil) {
         return;
     }
 
     UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
-    [viewController setModalPresentationStyle:UIModalPresentationFullScreen];
-    [rootViewController presentViewController:viewController animated:YES completion:nil];
-
-    activeViewController = viewController;
+    self.activeViewController.modalPresentationStyle = UIModalPresentationFullScreen;
+    [rootViewController presentViewController:self.activeViewController animated:YES completion:nil];
 }
 
-- (_Bool) dismissActiveViewController:(Class _Nullable)vcClass {
-    if (!activeViewController) {
-        return false;
-    }
-
-    if (vcClass && ![activeViewController isKindOfClass:vcClass]) {
-        return false;
+- (BOOL)dismissActiveViewController {
+    if (self.activeViewController == nil) {
+        return NO;
     }
-
-    [activeViewController dismissViewControllerAnimated:true completion:nil];
-    activeViewController = nil;
-
-    return true;
+    [self.activeViewController dismissViewControllerAnimated:YES completion:nil];
+    self.activeViewController = nil;
+    return YES;
 }
 
 @end
 
 /// Barcode Scanner Delegate
-@implementation BarcodeScannerPromiseProxy {
-    RCTPromiseResolveBlock _resolve;
-    BarcodeScannerPromiseProxy* _strongSelf;
-    bool _shouldIncludeBarcodeImage;
-    NSDictionary* _resultMessage;
-}
+@interface BarcodeScannerPromiseProxy()
+    @property(nonatomic, copy) RCTPromiseResolveBlock resolve;
+    @property(nonatomic, assign) BOOL shouldIncludeBarcodeImage;
+    @property(nonatomic, strong) NSMutableDictionary* resultMessage;
+@end
 
-- initWithResolver:(nonnull RCTPromiseResolveBlock)resolve shouldIncludeBarcodeImage:(bool)shouldWaitForGeneratedImage {
-    _resolve = resolve;
-    _strongSelf = self;
-    _shouldIncludeBarcodeImage = shouldWaitForGeneratedImage;
-    _resultMessage = @{@"status": @"OK"}.mutableCopy;
-    return [super init];
-}
+@implementation BarcodeScannerPromiseProxy
 
-- (void)reportResultsAndComplete {
-    _resolve(_resultMessage);
-    // release instance
-    _strongSelf = nil;
+- (instancetype)initWithResolver:(nonnull RCTPromiseResolveBlock)resolve
+       shouldIncludeBarcodeImage:(bool)shouldWaitForGeneratedImage {
+    self = [super init];
+    if (self) {
+        _resultMessage = @{@"status": @"OK"}.mutableCopy;
+        _resolve = resolve;
+        _shouldIncludeBarcodeImage = shouldWaitForGeneratedImage;
+    }
+    return self;
 }
 
 - (void)qrBarcodeDetectionViewController:(nonnull SBSDKUIBarcodeScannerViewController *)viewController
@@ -465,37 +487,37 @@ RCT_EXPORT_METHOD(cleanup:(RCTPromiseResolveBlock)resolve
             }
 
             [viewController dismissViewControllerAnimated:TRUE completion:nil];
-            [self reportResultsAndComplete];
+            self.resolve(self.resultMessage);
         });
     });
 }
 
 - (void)qrBarcodeDetectionViewControllerDidCancel:(SBSDKUIBarcodeScannerViewController *)viewController {
-    _resolve(@{@"status": @"CANCELED"});
-    // release instance
-    _strongSelf = nil;
+    self.resolve(@{@"status": @"CANCELED"});
 }
 
 - (void)qrBarcodeDetectionViewControllerDidTimeout:(SBSDKUIBarcodeScannerViewController *)viewController {
-    _resolve(@{
+    self.resolve(@{
         @"status": @"CANCELED",
         @"canceledDueToTimeout": @(true)
      });
-    // release instance
-    _strongSelf = nil;
 }
 
 @end
 
 /// Batch Barcode Scanner Delegate
-@implementation BatchBarcodeScannerPromiseProxy {
-    RCTPromiseResolveBlock _resolve;
-    BatchBarcodeScannerPromiseProxy* _strongSelf;
-}
-- initWithResolver:(nonnull RCTPromiseResolveBlock)resolve {
-    _resolve = resolve;
-    _strongSelf = self;
-    return [super init];
+@interface BatchBarcodeScannerPromiseProxy()
+    @property (nonatomic, copy) RCTPromiseResolveBlock resolve;
+@end
+
+@implementation BatchBarcodeScannerPromiseProxy
+
+- (instancetype) initWithResolver:(nonnull RCTPromiseResolveBlock)resolve {
+    self = [super init];
+    if (self) {
+        _resolve = resolve;
+    }
+    return self;
 }
 
 - (void)barcodesBatchScannerViewController:(SBSDKUIBarcodesBatchScannerViewController *)
@@ -507,9 +529,12 @@ RCT_EXPORT_METHOD(cleanup:(RCTPromiseResolveBlock)resolve
       @"barcodes": jsonFromMappedBarcodeResults(barcodeResults)
     };
 
-    _resolve(result);
+    self.resolve(result);
     [viewController dismissViewControllerAnimated:TRUE completion:nil];
-    // release instance
-    _strongSelf = nil;
 }
+
+- (void)barcodesBatchScannerViewControllerDidCancel:(SBSDKUIBarcodesBatchScannerViewController *)viewController {
+    self.resolve(@{@"status": @"CANCELED"});
+}
+
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-scanbot-barcode-scanner-sdk",
   "title": "Scanbot Barcode Scanner SDK for React Native",
-  "version": "4.0.0",
+  "version": "4.0.1-beta.1",
   "scanbot": {
     "iosVersion": "4.0.2"
   },

package/src/enum.ts

@@ -6,15 +6,24 @@
 
 export type Status = "OK" | "CANCELED";
 
+/** The SDK license status */
 export type LicenseStatus =
-    "Okay" |
-    "Trial" |
-    "Expired" |
-    "WrongOS" |
-    "Corrupted" |
-    "AppIDMismatch" |
-    "NotSet" |
-    "Unknown";
+  /** License is valid and accepted. */
+  | 'Okay'
+  /** No license set yet. The SDK is in trial mode. */
+  | 'Trial'
+  /** No license set yet. The SDKs trial mode is over. */
+  | 'Expired'
+  /** No license active. The set license does not cover the current operating system. */
+  | 'WrongOS'
+  /** No license active. The set license was unreadable or has an invalid format. */
+  | 'Corrupted'
+  /** No license active. The set licenses does not cover the current apps bundle identifier. */
+  | 'AppIDMismatch'
+  /** No license set yet. The SDKs trial mode is over. */
+  | 'NotSet'
+  /** License status is unknown. */
+  | 'Unknown';
 
 export type CameraImageFormat = "JPG" | "PNG";
 export type DocumentDetectorMode = "EDGE_BASED" | "ML_BASED";

package/src/result.ts

@@ -1,4 +1,4 @@
-import { BarcodeFormat, Status } from "./enum";
+import { BarcodeFormat, LicenseStatus, Status } from "./enum";
 
 export interface BarcodeResultField {
     /**
@@ -32,3 +32,14 @@ export type BarcodeScannerResult = BarcodeResult & {
 }
 
 export type BatchBarcodeScannerResult = BarcodeResult;
+
+export interface GetLicenseInfoResult {
+    /** True if the license is valid, false otherwise */
+    isLicenseValid: boolean;
+    /** The license status */
+    licenseStatus: LicenseStatus;
+    /** A short text description of the license status */
+    licenseStatusMessage: string;
+    /** The license expiration date in milliseconds */
+    licenseExpirationDate?: number;
+}