Merge pull request #23 from blinkcard/jenkins/stable-build

Jenkins/stable build

.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
-osx_image: xcode12.4
-xcode_sdk: iphonesimulator14.4
+osx_image: xcode12.5.1
+xcode_sdk: iphonesimulator14.5
 
 install: true
 before_install: ./travis/before_script.sh

BlinkCard.framework/Headers/BlinkCard.h

@@ -10,6 +10,7 @@
 #import "MBMicroblinkApp.h"
 #import "MBViewControllerFactory.h"
 #import "MBMicroblinkSDK.h"
+#import "MBProductIntegrationInfo.h"
 #import "MBException.h"
 #import "MBImage.h"
 #import "MBDateResult.h"

BlinkCard.framework/Headers/MBImage.h

@@ -94,7 +94,7 @@ MB_CLASS_AVAILABLE_IOS(8.0)
 /**
  * Creates MBCImage around CVPixelBufferRef.
  */
-+ (instancetype)imageWithCvPixelBuffer:(CVPixelBufferRef)buffer;
++ (instancetype)imageWithCvPixelBuffer:(CVPixelBufferRef)buffer orientation:(UIImageOrientation)orientation;
 
 @end
 

BlinkCard.framework/Headers/MBLicenseError.h

@@ -17,7 +17,11 @@ typedef NS_ENUM(NSInteger, MBCLicenseError) {
     MBCLicenseErrorUnableToDoRemoteLicenceCheck,
     MBCLicenseErrorLicenseIsLocked,
     MBCLicenseErrorLicenseCheckFailed,
-    MBCLicenseErrorInvalidLicense
+    MBCLicenseErrorInvalidLicense,
+    MBCLicenseErrorPermissionExpired,
+    MBCLicenseErrorPayloadCorrupted,
+    MBCLicenseErrorPayloadSignatureVerificationFailed,
+    MBCLicenseErrorIncorrectTokenState
 };
 
 typedef void(^MBCLicenseErrorBlock)(MBCLicenseError licenseError);

BlinkCard.framework/Headers/MBMicroblinkApp.h

@@ -116,13 +116,19 @@ static inline NSString * MBC_LOCALIZED(NSString *key) {
         }
     }
 
-    NSString *localizedString = MBC_LOCALIZED_FOR_LANGUAGE(key, [MBCMicroblinkApp sharedInstance].language);
+    NSString *language = [MBCMicroblinkApp sharedInstance].language;
+    NSString *localizedString = MBC_LOCALIZED_FOR_LANGUAGE(key, language);
 
 #ifndef DNDEBUG
     return localizedString;
 #else
-    if ([localizedString isEqualToString:MBC_LOCALIZED_DEFAULT_STRING(key)] && ![MBCMicroblinkApp.sharedInstance.language isEqualToString:@"en"]) {
-        localizedString = MBC_LOCALIZED_FOR_LANGUAGE(key, @"en");
+    if ([localizedString isEqualToString:MBC_LOCALIZED_DEFAULT_STRING(key)]) {
+        if (![language isEqualToString:@"ar-AE"] && [language hasPrefix:@"ar"]) {
+            localizedString = MBC_LOCALIZED_FOR_LANGUAGE(key, @"ar-AE");
+        }
+        else if (![language isEqualToString:@"en"]) {
+            localizedString = MBC_LOCALIZED_FOR_LANGUAGE(key, @"en");
+        }
     }
     return localizedString;
 #endif

BlinkCard.framework/Headers/MBMicroblinkDefines.h

@@ -33,14 +33,25 @@
 
 typedef void(^MBBlock)(void);
 
-#define MBASSERTE(condition, description)     \
+#ifdef SHOWCASE_DEV
+#define MBASSERTE(condition, description)                           \
      do {                                                           \
        NSAssert(condition, description);                            \
        if (!(condition)) {                                          \
          NSString *message = [NSString stringWithFormat:@"Assertion failed: (%s), %@, %s, file %s, line %d", #condition, description, __PRETTY_FUNCTION__, __FILE__, __LINE__]; \
          LOGE("%s", [message UTF8String]);                          \
        }                                                            \
      } while (0)
+#else
+#define MBASSERTE(condition, description)                           \
+     do {                                                           \
+       NSAssert(condition, description);                            \
+       if (!(condition)) {                                          \
+        NSString *message = [NSString stringWithFormat:@"Assertion failed: (%s), %@", #condition, description]; \
+         LOGE("%s", [message UTF8String]);                          \
+       }                                                            \
+     } while (0)
+#endif
 
 
 #ifdef MB_DISABLE_OBFUSCATION
@@ -57,4 +68,20 @@ typedef void(^MBBlock)(void);
 
 #define MB_OBFUSCATED(value) [NSString stringWithFormat:@"%s", OBFUSCATED(value)]
 
+#define MBASSERT_OR_RETURN(condition)               \
+    do {                                            \
+        NSAssert(condition, @"%s", #condition);     \
+        if (!(condition)) {                         \
+            return;                                 \
+        }                                           \
+    } while (0)
+
+#define MBASSERT_OR_RETURN_VALUE(condition, value)  \
+    do {                                            \
+        NSAssert(condition, @"%s", #condition);     \
+        if (!(condition)) {                         \
+            return value;                           \
+        }                                           \
+    } while(0)
+
 #endif /* MBMicroblinkDefines_h */

BlinkCard.framework/Headers/MBProductIntegrationInfo.h

@@ -0,0 +1,33 @@
+// Created by Jura Skrlec on 18.05.2021..
+// Copyright (c) 2021 Microblink Ltd. All rights reserved.
+
+// ANY UNAUTHORIZED USE OR SALE, DUPLICATION, OR DISTRIBUTION
+// OF THIS PROGRAM OR ANY OF ITS PARTS, IN SOURCE OR BINARY FORMS,
+// WITH OR WITHOUT MODIFICATION, WITH THE PURPOSE OF ACQUIRING
+// UNLAWFUL MATERIAL OR ANY OTHER BENEFIT IS PROHIBITED!
+// THIS PROGRAM IS PROTECTED BY COPYRIGHT LAWS AND YOU MAY NOT
+// REVERSE ENGINEER, DECOMPILE, OR DISASSEMBLE IT.
+
+#import <Foundation/Foundation.h>
+#import "MBMicroblinkDefines.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+MB_CLASS_AVAILABLE_IOS(9.0) MB_FINAL
+@interface MBCProductIntegrationInfo : NSObject
+
++ (instancetype)sharedInstance NS_SWIFT_NAME(shared());
+
+@property (nonatomic, strong, readonly) NSString *product;
+@property (nonatomic, strong, readonly) NSString *productVersion;
+@property (nonatomic, strong, readonly) NSString *packageName;
+@property (nonatomic, strong, readonly) NSString *platform;
+@property (nonatomic, strong, readonly) NSString *osVersion;
+@property (nonatomic, strong, readonly) NSString *device;
+@property (nonatomic, strong, readonly) NSString *userId;
+@property (nonatomic, strong, readonly) NSString *licensee;
+@property (nonatomic, strong, readonly) NSString *licenseId;
+
+@end
+
+NS_ASSUME_NONNULL_END

BlinkCard.framework/Headers/MBRecognizerRunnerViewController.h

@@ -69,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Internal state is used to use the fact that the same object exists on multiple consecutive frames, and using internal
  * state provides better scanning results.
  *
- * NOTE: This method must be called on the background thread.
+ * NOTE: This method must be called on the main thread.
  *
  *  @param resetState YES if state should be reset.
  */