anyline-ocr-react-native-module 52.0.1 → 53.0.0

package/android/build.gradle

@@ -61,7 +61,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'io.anyline:anylinesdk:52.0.1'
+    implementation 'io.anyline:anylinesdk:53.0.0'
     implementation "com.facebook.react:react-native:+"
     implementation("com.google.android.material:material:1.9.0")
     implementation 'androidx.multidex:multidex:2.0.1'

package/android/src/main/java/com/anyline/reactnative/ScanActivity.java

@@ -124,6 +124,9 @@ public class ScanActivity extends AppCompatActivity {
                 };
             } catch (JSONException e) {
                 finishWithError("Error parsing view config: " + e.getMessage());
+            } catch (Exception e) {
+                finishWithError(getString(getResources().getIdentifier("error_invalid_json_data", "string", getPackageName()))
+                        + "\n" + e.getLocalizedMessage());
             }
         } else {
             finishWithError("View config not found");
@@ -370,6 +373,7 @@ public class ScanActivity extends AppCompatActivity {
         Intent intent = new Intent();
         intent.putExtra(EXTRA_ERROR_MESSAGE, errorMessage);
         setResult(RESULT_ERROR, intent);
+        ResultReporter.onError(errorMessage);
         finish();
     }
 
@@ -382,13 +386,17 @@ public class ScanActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        scanView.start();
+        if (scanView.isInitialized()) {
+            scanView.start();
+        }
     }
 
     @Override
     protected void onPause() {
-        scanView.stop();
-        scanView.getCameraView().releaseCameraInBackground();
+        if (scanView.isInitialized()) {
+            scanView.stop();
+            scanView.getCameraView().releaseCameraInBackground();
+        }
         super.onPause();
     }
 

package/ios/ALNFCScanViewController.m

@@ -109,7 +109,7 @@ API_AVAILABLE(ios(13.0))
         return;
     }
     
-    self.mrzScanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+    self.mrzScanViewPlugin = (ALScanViewPlugin *)self.scanView.viewPlugin;
     
     self.scanView.supportedNativeBarcodeFormats = self.uiConfig.nativeBarcodeFormats;
     self.scanView.delegate = self;
@@ -155,7 +155,7 @@ API_AVAILABLE(ios(13.0))
 
 - (void)configureMRZPlugin {
     
-    ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+    ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)self.scanView.viewPlugin;
     if (![scanViewPlugin isKindOfClass:ALScanViewPlugin.class]) {
         return;
     }
@@ -183,14 +183,12 @@ API_AVAILABLE(ios(13.0))
     mrzConfig.mrzMinFieldConfidences.dateOfExpiry = @(90);
     
     NSError *error;
-    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withPluginConfig:pluginConfig
-                                                                               cutoutConfig:cutoutConfig
-                                                                         scanFeedbackConfig:scanFeedbackConfig];
-    ALScanViewPlugin *updatedScanViewPlugin = [[ALScanViewPlugin alloc] initWithConfig:scanViewPluginConfig error:&error];
-    [self.scanView setScanViewPlugin:updatedScanViewPlugin error:&error];
+
+    ALViewPluginConfig *scanViewPluginConfig = scanViewPlugin.scanViewPluginConfig;
+    [self.scanView setViewPluginConfig:scanViewPluginConfig error:&error];
     
     // the delegate binding was lost when you recreated the ScanPlugin it so you have to bring it back here
-    scanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+    scanViewPlugin = (ALScanViewPlugin *)self.scanView.viewPlugin;
     scanViewPlugin.scanPlugin.delegate = self;
 }
 
@@ -243,7 +241,7 @@ API_AVAILABLE(ios(13.0))
         resultDictionary[@"nativeBarcodesDetected"] = self.detectedBarcodes;
     }
     
-    NSObject<ALScanViewPluginBase> *scanViewPluginBase = self.scanView.scanViewPlugin;
+    NSObject<ALViewPluginBase> *scanViewPluginBase = self.scanView.viewPlugin;
     if ([scanViewPluginBase isKindOfClass:ALScanViewPlugin.class]) {
         ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)scanViewPluginBase;
         BOOL cancelOnResult = scanViewPlugin.scanPlugin.pluginConfig.cancelOnResult;

package/ios/ALPluginHelper.h

@@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class ALPluginConfig;
 
-typedef void (^ALPluginCallback)(id _Nullable callbackObj, NSString * _Nullable errorString);
+typedef void (^ALPluginCallback)(NSDictionary * _Nullable callbackObj, NSError * _Nullable error);
 
 
 @interface ALPluginHelper : NSObject

package/ios/ALPluginHelper.m

@@ -27,7 +27,8 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
         if (@available(iOS 13.0, *)) {
             
             if (![ALNFCDetector readingAvailable]) {
-                callback(nil, @"NFC passport reading is not supported on this device or app.");
+                callback(nil, [NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": @"NFC passport reading is not supported on this device or app."}]);
+                
                 return;
             }
             
@@ -42,7 +43,7 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
                                                                                              completion:nil];
             }
         } else {
-            callback(nil, @"NFC passport reading is only supported on iOS 13 and later.");
+            callback(nil,[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": @"NFC passport reading is only supported on iOS 13 and later."}]);
             return;
         }
     } else {
@@ -288,7 +289,7 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
 
         [[UIApplication sharedApplication].keyWindow.rootViewController
          dismissViewControllerAnimated:YES completion:^{
-            callback(nil, @"Canceled");
+            callback(nil, [NSError errorWithDomain:@"" code:-1 userInfo:@{@"Error reason": @"Canceled"}]);
         }];
     }];
 

package/ios/ALPluginScanViewController.m

@@ -35,6 +35,8 @@
 /// Applicable to non-composites (otherwise null)
 @property (nonatomic, readonly, nullable) ALPluginConfig *pluginConfig;
 
+@property (nonatomic, strong) NSError *scanViewError;
+
 @end
 
 
@@ -82,8 +84,9 @@
                                                     error:&error];
 
     if ([self showErrorAlertIfNeeded:error]) {
-        return;
-    }
+          self.scanViewError = error;
+          return;
+      }
 
     [self.view addSubview:self.scanView];
 
@@ -118,8 +121,15 @@
     [UIApplication sharedApplication].idleTimerDisabled = YES;
 
     NSError *error;
-    [self.scanView.scanViewPlugin startWithError:&error];
-    [self showErrorAlertIfNeeded:error];
+    if(!self.scanViewError){
+        [self.scanView.viewPlugin startWithError:&error];
+          [self showErrorAlertIfNeeded:error];
+      }
+      else{
+          [self dismissViewControllerAnimated:YES completion:^{
+              self.callback(nil, self.scanViewError);
+          }];
+      }
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
@@ -200,7 +210,7 @@
     }
 
     // dismiss the view controller, if cancelOnResult for the config is true
-    NSObject<ALScanViewPluginBase> *scanViewPluginBase = self.scanView.scanViewPlugin;
+    NSObject<ALViewPluginBase> *scanViewPluginBase = self.scanView.viewPlugin;
     if ([scanViewPluginBase isKindOfClass:ALScanViewPlugin.class]) {
         ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)scanViewPluginBase;
         BOOL cancelOnResult = scanViewPlugin.scanPlugin.pluginConfig.cancelOnResult;
@@ -289,7 +299,7 @@
 
 - (ALPluginConfig * _Nullable)pluginConfig {
     // applic. only to non-composites
-    NSObject<ALScanViewPluginBase> *scanVwPluginBase = self.scanView.scanViewPlugin;
+    NSObject<ALViewPluginBase> *scanVwPluginBase = self.scanView.viewPlugin;
     if ([scanVwPluginBase isKindOfClass:ALScanViewPlugin.class]) {
         return ((ALScanViewPlugin *)scanVwPluginBase).scanPlugin.pluginConfig;
     }
@@ -299,11 +309,11 @@
 // MARK: - Selector Actions
 
 - (void)doneButtonPressed:(id)sender {
-    [self.scanView.scanViewPlugin stop];
+    [self.scanView.viewPlugin stop];
 
     __weak __block typeof(self) weakSelf = self;
     [self dismissViewControllerAnimated:YES completion:^{
-        weakSelf.callback(nil, @"Canceled");
+        weakSelf.callback(nil, [NSError errorWithDomain:@"ALReactDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Canceled"}]);
     }];
 }
 
@@ -356,25 +366,23 @@
 
 // assume that pluginConfig carries the updated scanMode or whatever value that you wish to refresh.
 - (BOOL)updatePluginConfig:(ALPluginConfig *)pluginConfig error:(NSError * _Nullable * _Nullable)error {
-    ALScanViewPluginConfig *origSVPConfig = ((ALScanViewPlugin *)self.scanView.scanViewPlugin).scanViewPluginConfig;
-    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withPluginConfig:pluginConfig
-                                                                               cutoutConfig:origSVPConfig.cutoutConfig
-                                                                         scanFeedbackConfig:origSVPConfig.scanFeedbackConfig];
-    ALScanViewPlugin *newScanViewPlugin = [[ALScanViewPlugin alloc] initWithConfig:scanViewPluginConfig error:error];
-    if (!newScanViewPlugin) {
-        return NO;
-    }
-
-    newScanViewPlugin.scanPlugin.delegate = self;
+    ALViewPluginConfig *origSVPConfig = ((ALScanViewPlugin *)self.scanView.viewPlugin).scanViewPluginConfig;
 
-    BOOL success = [self.scanView setScanViewPlugin:newScanViewPlugin error:error];
+    origSVPConfig.pluginConfig = pluginConfig;
+    BOOL success = [self.scanView setViewPluginConfig:origSVPConfig error:error];
     if (!success) {
+        if([self showErrorAlertIfNeeded:*error]){
+                   [self dismissOnError:*error];
+               }
         return NO;
     }
 
-    success = [[self.scanView scanViewPlugin] startWithError:error];
+    success = [self.scanView.viewPlugin startWithError:error];
     if (!success) {
         // check error
+        if([self showErrorAlertIfNeeded:*error]){
+                    [self dismissOnError:*error];
+                }
         return NO;
     }
     return YES;
@@ -429,7 +437,18 @@
 // MARK: - Miscellaneous
 
 - (BOOL)showErrorAlertIfNeeded:(NSError *)error {
-    return [ALPluginHelper showErrorAlertIfNeeded:error pluginCallback:self.callback];
+    if (!error) {
+        return NO;
+    }
+    
+    return YES;
 }
 
+-(void)dismissOnError:(NSError *)error{
+    [self dismissViewControllerAnimated:YES completion:^{
+        self.callback(nil, error);
+    }];
+}
+
+
 @end

package/ios/AnylineReact.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Anyline/anyline-ocr-react-native-module.git", :tag => "#{s.version}" }
 
   s.source_files  = "*.{h,m}"
-  s.dependency "Anyline", "~> 52"
+  s.dependency "Anyline", "~> 53"
   s.dependency "React"
 
 end

package/ios/AnylineSDKPlugin.m

@@ -10,7 +10,7 @@ ALWrapperConfig *wrapperConfig = nil;
 
 @interface AnylineSDKPlugin()
 
-@property (nonatomic, strong) ALScanViewPluginConfig *conf;
+@property (nonatomic, strong) ALViewPluginConfig *conf;
 
 @property (nonatomic, copy) NSString *callbackId;
 @property (nonatomic, copy) NSString *appKey;
@@ -83,7 +83,7 @@ RCT_EXPORT_METHOD(setupAnylineSDKWithCacheConfig:(NSString *)licenseKey
     if (!success) {
         NSLog(@"error: %@", error.localizedDescription);
         errorString = @"Unable to initialize the Anyline SDK. Please check your license key.";
-        [self returnError:errorString];
+        [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": errorString}]];
         return;
     }
 
@@ -127,7 +127,7 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
 
     if (!exportPath) {
         NSString *errorString = @"Event cache is empty.";
-        [self returnError:errorString];
+        [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": errorString}]];
     } else {
         [self returnSuccess:exportPath];
     }
@@ -158,7 +158,7 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
     self.nativeBarcodeScanning = nativeBarcodeScanning ? nativeBarcodeScanning : NO;
 
     self.jsonUIConf = [[ALJSONUIConfiguration alloc] initWithDictionary:optionsDictionary];
-    self.conf = [[ALScanViewPluginConfig alloc] initWithJSONDictionary:optionsDictionary error:&error];
+    self.conf = [[ALViewPluginConfig alloc] initWithJSONDictionary:optionsDictionary error:&error];
     self.ocrConfigDict = [dictionary objectForKey:@"ocr"];
 
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -172,8 +172,8 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
                         ALNFCScanViewController *nfcScanViewController = [[ALNFCScanViewController alloc] initWithLicensekey:self.appKey
                                                                                                                configuration:dictionary
                                                                                                                     uiConfig:self.jsonUIConf
-                                                                                                                    finished:^(id  _Nullable callbackObj, NSString * _Nullable errorString) {
-                            [self returnCallback:callbackObj andErrorString:errorString];
+                                                                                                                    finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                            [self returnCallback:callbackObj andError:error];
                         }];
 
                         if (nfcScanViewController != nil){
@@ -181,17 +181,18 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
                             [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:nfcScanViewController animated:YES completion:nil];
                         }
                     } else {
-                        [self returnError:@"NFC passport reading is not supported on this device or app."];
+                        [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": @"NFC passport reading is not supported on this device or app."}]];
                     }
                 } else {
-                    [self returnError:@"NFC passport reading is only supported on iOS 13 and later."];
+                    [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": @"NFC passport reading is only supported on iOS 13 and later."}]];
+
                 }
             } else {
                 ALPluginScanViewController *pluginScanViewController =
                 [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
                                                          configuration:dictionary
-                                                       uiConfiguration:self.jsonUIConf finished:^(id  _Nullable callbackObj, NSString * _Nullable errorString) {
-                    [self returnCallback:callbackObj andErrorString:errorString];
+                                                       uiConfiguration:self.jsonUIConf finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                    [self returnCallback:callbackObj andError:error];
                 }];
                 
                 if (pluginScanViewController != nil){
@@ -203,8 +204,8 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
             ALPluginScanViewController *pluginScanViewController =
             [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
                                                      configuration:dictionary
-                                                   uiConfiguration:self.jsonUIConf finished:^(id  _Nullable callbackObj, NSString * _Nullable errorString) {
-                [self returnCallback:callbackObj andErrorString:errorString];
+                                                   uiConfiguration:self.jsonUIConf finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                [self returnCallback:callbackObj andError:error];
             }];
             
             if (pluginScanViewController != nil){
@@ -235,11 +236,11 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
 }
 
 - (void)pluginScanViewController:(nonnull ALPluginScanViewController *)pluginScanViewController didStopScanning:(nonnull id)sender {
-    [self returnError:(@"Canceled")];
+    [self returnError: [NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{@"Error reason": @"Canceled"}]];
 }
 
 - (void)pluginScanViewController:(ALPluginScanViewController *)pluginScanViewController didStopScanning:(id)sender error:(NSError *)error {
-    [self returnError:error.debugDescription];
+    [self returnError:error];
 }
 
 - (BOOL)scanModeIndex:(NSString *)scanMode{
@@ -251,20 +252,20 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
 
 }
 
-- (void)returnCallback:(id _Nullable)callbackObj andErrorString:(NSString * _Nullable)errorString {
+- (void)returnCallback:(id _Nullable)callbackObj andError:(NSError * _Nullable)error {
     NSString *resultStr;
-    NSError *error;
-    if (errorString) {
-        [self returnError:errorString];
+    NSError *errorObj;
+    if (error) {
+            [self returnError:error];
     } else if ([NSJSONSerialization isValidJSONObject:callbackObj]) {
-        resultStr = [(NSDictionary *)callbackObj toJSONStringPretty:YES error:&error];
-        if (error) {
-            [self returnError:error.debugDescription];
+        resultStr = [(NSDictionary *)callbackObj toJSONStringPretty:YES error:&errorObj];
+        if (errorObj) {
+            [self returnError:errorObj];
         }
         [self returnSuccess:resultStr];
     } else {
         resultStr = @"callback object should be of JSON type";
-        [self returnError:resultStr];
+        [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{NSLocalizedDescriptionKey: resultStr}]];
     }
 }
 
@@ -276,11 +277,11 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
     }
 }
 
-- (void)returnError:(NSString *)error {
+- (void)returnError:(NSError *)error {
     if ([self.returnMethod isEqualToString:@"callback"]) {
         self.onErrorCallback(@[error]);
     } else if ([self.returnMethod isEqualToString:@"promise"]) {
-        _rejectBlock(@"ANYLINE_ERROR", error, nil);
+        _rejectBlock(@"ANYLINE_ERROR", error.localizedDescription, error);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^52.0.1",
-  "_id": "anyline-ocr-react-native-module@^52.0.1",
+  "_from": "anyline-ocr-react-native-module@^53.0.0",
+  "_id": "anyline-ocr-react-native-module@^53.0.0",
   "_inBundle": false,
   "_integrity": "sha512-BGi9zNkSsoxXywDBIqzgBRvKUBniQOJHDKBrozZubKthZNRBAj8Ry5tW0Me0yLXt/fauME//hbC0wsenfPJZqw==",
   "_location": "/anyline-ocr-react-native-module",
@@ -8,19 +8,19 @@
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "anyline-ocr-react-native-module@^52.0.1",
+    "raw": "anyline-ocr-react-native-module@^53.0.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^52.0.1",
+    "rawSpec": "^53.0.0",
     "saveSpec": null,
-    "fetchSpec": "^52.0.1"
+    "fetchSpec": "^53.0.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-52.0.1.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-53.0.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^52.0.1",
+  "_spec": "anyline-ocr-react-native-module@^53.0.0",
   "_where": "/Users/amiransari/Projects/anyline-ocr-react-native-module1/example/RNExampleApp",
   "bugs": {
     "url": "https://github.com/Anyline/anyline-ocr-react-native-module/issues"
@@ -47,5 +47,5 @@
     "type": "git",
     "url": "git+https://github.com/Anyline/anyline-ocr-react-native-module.git"
   },
-  "version": "52.0.1"
+  "version": "53.0.0"
 }