Merge pull request #165 from BlinkID/release/v6.5.0

Release/v6.5.0
BlinkID · Feb 16, 2024 · a5e583c · a5e583c
2 parents f1500b1 + 63b3b10
commit a5e583c
Show file tree

Hide file tree

Showing 9 changed files with 194 additions and 172 deletions.
diff --git a/BlinkID/package.json b/BlinkID/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blinkid-cordova",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "A small and powerful ID card scanning library",
   "cordova": {
     "id": "blinkid-cordova",

diff --git a/BlinkID/plugin.xml b/BlinkID/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="blinkid-cordova" 
-        version="6.4.0">
+        version="6.5.0">
 
     <name>BlinkIdScanner</name>
     <description>A small and powerful ID card scanning library</description>

diff --git a/BlinkID/scripts/initIOSFramework.sh b/BlinkID/scripts/initIOSFramework.sh
@@ -4,7 +4,7 @@
 HERE="$(dirname "$(test -L "$0" && readlink "$0" || echo "$0")")"
 pushd "${HERE}/../src/ios/" > /dev/null
 
-LINK='https://github.com/BlinkID/blinkid-ios/releases/download/v6.4.0/BlinkID.xcframework.zip'
+LINK='https://github.com/BlinkID/blinkid-ios/releases/download/v6.5.0/BlinkID.xcframework.zip'
 FILENAME='BlinkID.xcframework.zip'
 
 # BlinkID framework will be obtained via wget or curl

diff --git a/...croblink/blinkid/plugins/cordova/recognizers/serialization/BlinkIDSerializationUtils.java b/...croblink/blinkid/plugins/cordova/recognizers/serialization/BlinkIDSerializationUtils.java
@@ -123,6 +123,7 @@ public static JSONObject serializeImageAnalysisResult(ImageAnalysisResult imageA
         jsonImageAnalysis.put("mrzDetectionStatus", SerializationUtils.serializeEnum(imageAnalysisResult.getMrzDetectionStatus()));
         jsonImageAnalysis.put("barcodeDetectionStatus", SerializationUtils.serializeEnum(imageAnalysisResult.getBarcodeDetectionStatus()));
         jsonImageAnalysis.put("cardRotation", BlinkIDSerializationUtils.serializeCardRotation(imageAnalysisResult.getCardRotation()));
+        jsonImageAnalysis.put("cardOrientation", SerializationUtils.serializeEnum(imageAnalysisResult.getCardOrientation()));
         return jsonImageAnalysis;
     }
 

diff --git a/BlinkID/src/android/libBlinkID.gradle b/BlinkID/src/android/libBlinkID.gradle
@@ -6,7 +6,7 @@ repositories {
 }
 
 dependencies {
-    implementation('com.microblink:blinkid:6.4.0@aar') {
+    implementation('com.microblink:blinkid:6.5.0@aar') {
         transitive = true
     }
 }

diff --git a/BlinkID/src/ios/sources/MBBlinkIDSerializationUtils.m b/BlinkID/src/ios/sources/MBBlinkIDSerializationUtils.m
@@ -214,7 +214,8 @@ +(NSDictionary *) serializeImageAnalysisResult:(MBImageAnalysisResult *)imageAna
              @"faceDetectionStatus" : [NSNumber numberWithInteger:(imageAnalysisResult.faceDetectionStatus)],
              @"mrzDetectionStatus" : [NSNumber numberWithInteger:(imageAnalysisResult.mrzDetectionStatus)],
              @"barcodeDetectionStatus" : [NSNumber numberWithInteger:(imageAnalysisResult.barcodeDetectionStatus)],
-             @"cardRotation" : [NSNumber numberWithInteger:(imageAnalysisResult.cardRotation)]
+             @"cardRotation" : [NSNumber numberWithInteger:(imageAnalysisResult.cardRotation)],
+             @"cardOrientation" : [NSNumber numberWithInteger:(imageAnalysisResult.cardOrientation)]
         };
 }
 
@@ -249,19 +250,19 @@ +(MBClassAnonymizationSettings *) deserializeMBClassAnonymizationSettings:(NSDic
         NSNumber *region = [jsonClassAnonymizationSettings valueForKey:@"region"];
         NSNumber *type = [jsonClassAnonymizationSettings valueForKey:@"type"];
 
-        if (![country isEqual:[NSNull null]] && ![region isEqual:[NSNull null]] && ![type isEqual:[NSNull null]]) {
+        if (![country isEqual:[NSNull null]] && country.integerValue != nil && ![region isEqual:[NSNull null]] && region.integerValue != nil && ![type isEqual:[NSNull null]] && type.integerValue != nil) {
             return [[MBClassAnonymizationSettings alloc] initWithCountry:country.integerValue region:region.integerValue type:type.integerValue fields:fields];
-        } else if (![country isEqual:[NSNull null]] && ![type isEqual:[NSNull null]]) {
+        } else if (![country isEqual:[NSNull null]] && country.integerValue != nil && ![type isEqual:[NSNull null]] && type.integerValue != nil){
             return [[MBClassAnonymizationSettings alloc] initWithCountry:country.integerValue type:type.integerValue fields:fields];
-        } else if (![country isEqual:[NSNull null]] && ![region isEqual:[NSNull null]] ) {
+        } else if (![country isEqual:[NSNull null]] && country.integerValue != nil && ![region isEqual:[NSNull null]] && region.integerValue != nil ) {
             return [[MBClassAnonymizationSettings alloc] initWithCountry:country.integerValue region:region.integerValue fields:fields];
-        } else if (![region isEqual:[NSNull null]] && ![type isEqual:[NSNull null]]) {
-            return [[MBClassAnonymizationSettings alloc] initWithRegion:region.integerValue type:type.integerValue fields:fields];
-        } else if (![country isEqual:[NSNull null]]) {
+       } else if (![region isEqual:[NSNull null]] && region.integerValue != nil && ![type isEqual:[NSNull null]] && type.integerValue != nil ) {
+           return [[MBClassAnonymizationSettings alloc] initWithRegion:region.integerValue type:type.integerValue fields:fields];
+        } else if (![country isEqual:[NSNull null]] && country.integerValue != nil ) {
             return [[MBClassAnonymizationSettings alloc] initWithCountry:country.integerValue fields:fields];
-        } else if (![region isEqual:[NSNull null]] ) {
+        } else if (![region isEqual:[NSNull null]] && region.integerValue != nil) {
             return [[MBClassAnonymizationSettings alloc] initWithRegion:region.integerValue fields:fields];
-        } else if (![type isEqual:[NSNull null]]) {
+        } else if (![type isEqual:[NSNull null]] && type.integerValue != nil ) {
             return [[MBClassAnonymizationSettings alloc] initWithType:type.integerValue fields:fields];
         }