diff --git a/MicroBlink.bundle/Info.plist b/MicroBlink.bundle/Info.plist index 7eb7a152..5845d353 100644 Binary files a/MicroBlink.bundle/Info.plist and b/MicroBlink.bundle/Info.plist differ diff --git a/MicroBlink.framework/Headers/MBException.h b/MicroBlink.framework/Headers/MBException.h new file mode 100644 index 00000000..1fab2781 --- /dev/null +++ b/MicroBlink.framework/Headers/MBException.h @@ -0,0 +1,20 @@ +// +// MBException.h +// Pdf417MobiDev +// +// Created by Jura Skrlec on 07/02/2018. +// + +#ifndef MBException_h +#define MBException_h + +typedef NSString * MBExceptionName NS_EXTENSIBLE_STRING_ENUM; + +FOUNDATION_EXPORT MBExceptionName const MBIllegalModificationException; +FOUNDATION_EXPORT MBExceptionName const MBInvalidLicenseKeyException; +FOUNDATION_EXPORT MBExceptionName const MBInvalidLicenseeKeyException; +FOUNDATION_EXPORT MBExceptionName const MBInvalidLicenseResourceException; +FOUNDATION_EXPORT MBExceptionName const MBInvalidBundleException; +FOUNDATION_EXPORT MBExceptionName const MBMissingSettingsException; + +#endif /* MBException_h */ diff --git a/MicroBlink.framework/Headers/MBFrameGrabberRecognizer.h b/MicroBlink.framework/Headers/MBFrameGrabberRecognizer.h index 8be58350..ff0cec1f 100644 --- a/MicroBlink.framework/Headers/MBFrameGrabberRecognizer.h +++ b/MicroBlink.framework/Headers/MBFrameGrabberRecognizer.h @@ -22,7 +22,7 @@ PP_CLASS_AVAILABLE_IOS(8.0) @interface MBFrameGrabberRecognizer : MBRecognizer - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithFrameGrabberDelegate:(id)frameGrabberDelegate error:(NSError * _Nullable * _Nonnull)error __attribute__((swift_error(nonnull_error))) NS_SWIFT_NAME(init(frameGrabberDelegate:)); +- (instancetype)initWithFrameGrabberDelegate:(id)frameGrabberDelegate NS_SWIFT_NAME(init(frameGrabberDelegate:)); /** * Allow sending focused camera frames to MBFrameGrabberRecognizerDelegate. diff --git a/MicroBlink.framework/Headers/MBMicroBlinkInitialization.h b/MicroBlink.framework/Headers/MBMicroBlinkInitialization.h index 23c2cf35..445e6167 100644 --- a/MicroBlink.framework/Headers/MBMicroBlinkInitialization.h +++ b/MicroBlink.framework/Headers/MBMicroBlinkInitialization.h @@ -9,8 +9,6 @@ #define MBMicroBlinkInitialization_h #define MB_INIT \ -- (instancetype)init NS_UNAVAILABLE; \ -- (instancetype)initWithError:(NSError **)error __attribute__((swift_error(nonnull_error))) NS_SWIFT_NAME(init()) NS_DESIGNATED_INITIALIZER; \ - +- (instancetype)init NS_DESIGNATED_INITIALIZER; \ #endif /* MBMicroBlinkInitialization_h */ diff --git a/MicroBlink.framework/Headers/MBMicroblinkSDK.h b/MicroBlink.framework/Headers/MBMicroblinkSDK.h index 35b924e0..0343bd8c 100644 --- a/MicroBlink.framework/Headers/MBMicroblinkSDK.h +++ b/MicroBlink.framework/Headers/MBMicroblinkSDK.h @@ -21,9 +21,8 @@ PP_CLASS_AVAILABLE_IOS(8.0) /** * Set license buffer and unlock the SDK. Application package will be used to validate the license. * @param licenseBuffer Byte array containing the license. - * @param error Out with invalid license key error. */ -- (BOOL)setLicenseBuffer:(NSData * _Nonnull)licenseBuffer error:(NSError * _Nullable * _Nonnull)error; +- (void)setLicenseBuffer:(NSData * _Nonnull)licenseBuffer; /** * Set license buffer and unlock the SDK. Also define licensee that will be used to validate the license. @@ -32,16 +31,14 @@ PP_CLASS_AVAILABLE_IOS(8.0) * single license within multiple application packages. * @param licenseBuffer Byte array containing the license. * @param licensee Licensee to which license is given to. - * @param error Out with invalid license key error. */ -- (BOOL)setLicenseBuffer:(NSData * _Nonnull)licenseBuffer andLicensee:(NSString * _Nonnull)licensee error:(NSError * _Nullable * _Nonnull)error; +- (void)setLicenseBuffer:(NSData * _Nonnull)licenseBuffer andLicensee:(NSString * _Nonnull)licensee; /** * Set license key and unlock the SDK. Application package will be used to validate the license. * @param base64LicenseKey License file encoded as base64 string. - * @param error Out with invalid license key error. */ -- (BOOL)setLicenseKey:(NSString * _Nonnull)base64LicenseKey error:(NSError * _Nullable * _Nonnull)error; +- (void)setLicenseKey:(NSString * _Nonnull)base64LicenseKey; /** * Set license key and unlock the SDK. Also define licensee that will be used to validate the license. @@ -50,9 +47,8 @@ PP_CLASS_AVAILABLE_IOS(8.0) * single license within multiple application packages. * @param base64LicenseKey Byte array containing the license. * @param licensee Licensee to which license is given to. - * @param error Out with invalid license key error. */ -- (BOOL)setLicenseKey:(NSString * _Nonnull)base64LicenseKey andLicensee:(NSString * _Nonnull)licensee error:(NSError * _Nullable * _Nonnull)error; +- (void)setLicenseKey:(NSString * _Nonnull)base64LicenseKey andLicensee:(NSString * _Nonnull)licensee; /** * Set the license file and unlock the SDK. Application package will be used to validate the license. @@ -60,9 +56,8 @@ PP_CLASS_AVAILABLE_IOS(8.0) * @param extension The filename extension of the file (etc. txt). If you specify an empty string or nil, the extension is assumed not to exist and the file URL is the first file encountered that exactly matches name. * @param subdirectory The valid path of top-level directory in which file is located inside bundle (etc. licenseFiles/). If you specify an empty string or nil, root direcotry of bundle will be searched. * @param bundle NSBundle bundle required to access file. - * @param error Out with invalid license key error. */ -- (BOOL)setLicenseResource:(NSString * _Nonnull)fileName withExtension:(NSString * _Nullable)extension inSubdirectory:(NSString * _Nullable)subdirectory forBundle:(NSBundle * _Nonnull)bundle error:(NSError * _Nullable * _Nonnull)error; +- (void)setLicenseResource:(NSString * _Nonnull)fileName withExtension:(NSString * _Nullable)extension inSubdirectory:(NSString * _Nullable)subdirectory forBundle:(NSBundle * _Nonnull)bundle; /** * Set the license file and unlock the SDK. Also define licensee that will be used to validate the license. @@ -74,9 +69,8 @@ PP_CLASS_AVAILABLE_IOS(8.0) * @param subdirectory The valid path of top-level directory in which file is located inside bundle (etc. licenseFiles/). If you specify an empty string or nil, root direcotry of bundle will be searched. * @param bundle NSBundle bundle required to access file. * @param licensee Licensee to which license is given to. - * @param error Out with invalid license key error. */ -- (BOOL)setLicenseResource:(NSString * _Nonnull)fileName withExtension:(NSString * _Nullable)extension inSubdirectory:(NSString * _Nullable)subdirectory forBundle:(NSBundle * _Nonnull)bundle andLicensee:(NSString *)licensee error:(NSError * _Nullable * _Nonnull)error; +- (void)setLicenseResource:(NSString * _Nonnull)fileName withExtension:(NSString * _Nullable)extension inSubdirectory:(NSString * _Nullable)subdirectory forBundle:(NSBundle * _Nonnull)bundle andLicensee:(NSString *)licensee; @end diff --git a/MicroBlink.framework/Headers/MBSuccessFrameGrabberRecognizer.h b/MicroBlink.framework/Headers/MBSuccessFrameGrabberRecognizer.h index 4eb83830..3008c2a6 100644 --- a/MicroBlink.framework/Headers/MBSuccessFrameGrabberRecognizer.h +++ b/MicroBlink.framework/Headers/MBSuccessFrameGrabberRecognizer.h @@ -19,7 +19,7 @@ PP_CLASS_AVAILABLE_IOS(8.0) @interface MBSuccessFrameGrabberRecognizer : MBRecognizer - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithRecognizer:(MBRecognizer *)recognizer error:(NSError * _Nullable * _Nonnull)error __attribute__((swift_error(nonnull_error))) NS_SWIFT_NAME(init(recognizer:)) NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithRecognizer:(MBRecognizer *)recognizer NS_SWIFT_NAME(init(recognizer:)) NS_DESIGNATED_INITIALIZER; /** * SuccessFrameGrabber recognizer results diff --git a/MicroBlink.framework/Headers/MBViewControllerFactory.h b/MicroBlink.framework/Headers/MBViewControllerFactory.h index 5bfa8485..8daeb1a4 100644 --- a/MicroBlink.framework/Headers/MBViewControllerFactory.h +++ b/MicroBlink.framework/Headers/MBViewControllerFactory.h @@ -34,7 +34,7 @@ PP_CLASS_AVAILABLE_IOS(6.0) * * @return Scanning view controller fully initialized for presenting on screen. */ -+ (UIViewController *)recognizerRunnerViewControllerWithOverlayViewController:(MBOverlayViewController *)overlayViewController error:(NSError **)error __attribute__((swift_error(nonnull_error))) NS_SWIFT_NAME(recognizerRunnerViewController(withOverlayViewController:)); ++ (UIViewController *)recognizerRunnerViewControllerWithOverlayViewController:(MBOverlayViewController *)overlayViewController NS_SWIFT_NAME(recognizerRunnerViewController(withOverlayViewController:)); @end diff --git a/MicroBlink.framework/Headers/MicroBlink.h b/MicroBlink.framework/Headers/MicroBlink.h index e70c83ea..69c31ddf 100644 --- a/MicroBlink.framework/Headers/MicroBlink.h +++ b/MicroBlink.framework/Headers/MicroBlink.h @@ -68,6 +68,9 @@ // Settings #import "MBBarcodeOverlaySettings.h" +// Exception +#import "MBException.h" + // Detectors #import "MBQuadrangle.h" #import "MBDisplayableQuadDetection.h" diff --git a/MicroBlink.framework/Info.plist b/MicroBlink.framework/Info.plist index 308cc62d..3118d44d 100644 Binary files a/MicroBlink.framework/Info.plist and b/MicroBlink.framework/Info.plist differ diff --git a/MicroBlink.framework/MicroBlink b/MicroBlink.framework/MicroBlink index 4a13353c..83fa3d21 100755 Binary files a/MicroBlink.framework/MicroBlink and b/MicroBlink.framework/MicroBlink differ diff --git a/MicroBlink.framework/_CodeSignature/CodeResources b/MicroBlink.framework/_CodeSignature/CodeResources index 43392357..11e2ab24 100644 --- a/MicroBlink.framework/_CodeSignature/CodeResources +++ b/MicroBlink.framework/_CodeSignature/CodeResources @@ -84,9 +84,13 @@ 0Gw2Cqe1mXgLhPbf9ipGpsrnSnM= + Headers/MBException.h + + GE2w2FGq4uGpzIdklhFi0gBzcHw= + Headers/MBFrameGrabberRecognizer.h - +zqfTxHKO6jAc+Rx2ek7NgE4P6Q= + tAq++R25n251xE0aQyTJ+/0QBzc= Headers/MBGlareStatusOverlaySubview.h @@ -102,11 +106,11 @@ Headers/MBMicroBlinkInitialization.h - sLw1aqe7tJy8gDlLXQe52CGmKKo= + sgABlDoGH26XdB1GZ1a7ItMweLg= Headers/MBMicroblinkSDK.h - nfMdE1LVECQRZY208k3xCT643a4= + wufGPbif1mBbQFMeFcAWML9gd50= Headers/MBModernBaseOverlayViewController.h @@ -206,7 +210,7 @@ Headers/MBSuccessFrameGrabberRecognizer.h - z3fYsf1a7c+mIwwudHu/kHwlTTM= + hU3Vl9dB6RlE0MepQ5YjH5OdV3I= Headers/MBSuccessFrameGrabberRecognizerResult.h @@ -234,7 +238,7 @@ Headers/MBViewControllerFactory.h - QQxRjY4fbTFqgwRhP3JpDmEl+pA= + AAZiZWeRfrX0Y3EKmR6f23Cl8wA= Headers/MBViewFinderOverlaySubview.h @@ -242,7 +246,7 @@ Headers/MicroBlink.h - k6QrZAu5nFbUEgF43yKy3bP/cdU= + /EtYLO/ooG4tzC78J5Jt+SS1JQY= Headers/PPApp.h @@ -567,15 +571,26 @@ t4UfMJ0PvqlCMWyThaDqY9T8TUjr2VBMuM8nmpanBIE= + Headers/MBException.h + + hash + + GE2w2FGq4uGpzIdklhFi0gBzcHw= + + hash2 + + VlKY4CEhCQ480jhU+tgpCktVXVutctVoBBUmM+DFPbs= + + Headers/MBFrameGrabberRecognizer.h hash - +zqfTxHKO6jAc+Rx2ek7NgE4P6Q= + tAq++R25n251xE0aQyTJ+/0QBzc= hash2 - GdfiFRhKpGJZxjgv/zJjc5m8KF13f8G4HpFy+PhS5+Q= + A9P/z37gLo7OEhS8Q1WUovIITA8lkuq/u3yJiXmQON4= Headers/MBGlareStatusOverlaySubview.h @@ -615,22 +630,22 @@ hash - sLw1aqe7tJy8gDlLXQe52CGmKKo= + sgABlDoGH26XdB1GZ1a7ItMweLg= hash2 - uijfUJ0QL9OPfw62lcuAG5H6RC26vxxDjSVo9vCoC2Y= + 9efDheUTLW+Gba3+ysJkS3kt8dDnhWxTgUDB06ZeEww= Headers/MBMicroblinkSDK.h hash - nfMdE1LVECQRZY208k3xCT643a4= + wufGPbif1mBbQFMeFcAWML9gd50= hash2 - saXVXiSuwpu7X2YKUIxFZFbisPG3ESUIO0rQnQos5iE= + SsZJb0Kh0QV55ifuZipAXp4xM/rOleBgpnyBwrI7x5Q= Headers/MBModernBaseOverlayViewController.h @@ -901,11 +916,11 @@ hash - z3fYsf1a7c+mIwwudHu/kHwlTTM= + hU3Vl9dB6RlE0MepQ5YjH5OdV3I= hash2 - xPxlbTPJ3I05n2er7YxnXnclnazpIwzBKOF/JhaN/Fk= + GohreXh5yy2T9kir5Kp5u/Wms7gGzUK6jmQbFsJrny0= Headers/MBSuccessFrameGrabberRecognizerResult.h @@ -978,11 +993,11 @@ hash - QQxRjY4fbTFqgwRhP3JpDmEl+pA= + AAZiZWeRfrX0Y3EKmR6f23Cl8wA= hash2 - BhYSk9KquDt7riSaULZu7T4eWJEgKId2bU79DbfN6Uw= + Q57SqAvO4tsWGsFoP/NIkm5ji3tYr8cHRA41NrvuAmI= Headers/MBViewFinderOverlaySubview.h @@ -1000,11 +1015,11 @@ hash - k6QrZAu5nFbUEgF43yKy3bP/cdU= + /EtYLO/ooG4tzC78J5Jt+SS1JQY= hash2 - tqMci8qUITzYsMa0rz+hX2PFJd2VH3m98vm/9GQF94g= + AGEkSszo9bajI2KB0YON40JTkwcsw9RjJQZw9gystCY= Headers/PPApp.h diff --git a/docs/Classes/MBBaseBarcodeOverlayViewController.html b/docs/Classes/MBBaseBarcodeOverlayViewController.html index 9d19bbcd..f6384d39 100644 --- a/docs/Classes/MBBaseBarcodeOverlayViewController.html +++ b/docs/Classes/MBBaseBarcodeOverlayViewController.html @@ -223,6 +223,26 @@ +