Merge pull request #320 from BlinkID/release/v6.6.1

Release/v6.6.1

Author: medvedecrobertmb

BlinkIDSample/BlinkID-ComposeFragmentSample/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:name="com.microblink.BlinkIdSampleApp"
         android:allowBackup="true"

BlinkIDSample/BlinkID-ComposeMinimalSample/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:name="com.microblink.blinkid.BlinkIdSampleApp"
         android:allowBackup="true"

BlinkIDSample/BlinkID-ComposeMinimalSample/src/main/assets/com.microblink.blinkid.mblic

@@ -4,7 +4,6 @@
     android:versionName="1">
 
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-feature
         android:name="android.hardware.camera"

BlinkIDSample/BlinkID-MinimalSampleAdvanced/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     android:versionCode="1"
     android:versionName="1">
 
-    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-feature

BlinkIDSample/BlinkID-MinimalSampleAdvanced/src/main/assets/com.microblink.blinkid.mblic

@@ -8,7 +8,7 @@ class BlinkIdSampleApp : Application() {
     override fun onCreate() {
         super.onCreate()
         // obtain your licence at http://microblink.com/login or contact us at http://help.microblink.com
-        MicroblinkSDK.setLicenseKey("sRwCABZjb20ubWljcm9ibGluay5ibGlua2lkAGxleUpEY21WaGRHVmtUMjRpT2pFM01URXdNamd4TnpVeU5qQXNJa055WldGMFpXUkdiM0lpT2lKa1pHUXdOalpsWmkwMU9ESXpMVFF3TURndE9UUTRNQzAxTkRVNFlqQXhZVFUyWWpnaWZRPT0XQSGw4MlSYFI4GLBuTrvzIIXpisl+k7h/R9V8iUNw+edq0mlVNOnFqeHImrWXu8UbaKaxqggm6j+lxv818EBLdZ3EaqbZnHZxvOJ2r6SmLdfH8BKXU8OQkyr0VLU4be2TM2DmktEjagaIbkikp96uNyEKCx/3ag==", this)
+        MicroblinkSDK.setLicenseFile("com.microblink.blinkid.mblic", this)
 
         // use optimised way for transferring RecognizerBundle between activities, while ensuring
         // data does not get lost when Android restarts the scanning activity

BlinkIDSample/BlinkID-aMinimalSample/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application>
         <activity android:name="com.microblink.blinkid.help.HelpActivity"/>
         <activity android:name="com.microblink.blinkid.result.activity.RecognizerBundleResultActivity"/>

BlinkIDSample/BlinkID-aMinimalSample/src/main/java/com/microblink/blinkid/BlinkIdSampleApp.kt

@@ -12,8 +12,8 @@ protected BaseResultExtractorFactory createResultExtractorFactory() {
     }
 
     @Override
-    protected String getLicenseKey() {
-        return "sRwCABZjb20ubWljcm9ibGluay5ibGlua2lkAGxleUpEY21WaGRHVmtUMjRpT2pFM01URXdNamd4TnpVeU5qQXNJa055WldGMFpXUkdiM0lpT2lKa1pHUXdOalpsWmkwMU9ESXpMVFF3TURndE9UUTRNQzAxTkRVNFlqQXhZVFUyWWpnaWZRPT0XQSGw4MlSYFI4GLBuTrvzIIXpisl+k7h/R9V8iUNw+edq0mlVNOnFqeHImrWXu8UbaKaxqggm6j+lxv818EBLdZ3EaqbZnHZxvOJ2r6SmLdfH8BKXU8OQkyr0VLU4be2TM2DmktEjagaIbkikp96uNyEKCx/3ag==";
+    protected String getLicenceFilePath() {
+            return "com.microblink.blinkid.mblic";
     }
 
-}
+}

BlinkIDSample/LibUtils/src/main/AndroidManifest.xml

@@ -34,9 +34,9 @@ public void onCreate() {
         }
 
         if (isRecognitionSupported) {
-            String licenseKey = getLicenseKey();
-            if (licenseKey != null) {
-                MicroblinkSDK.setLicenseKey(licenseKey, this);
+            String licenseFilePath = getLicenceFilePath();
+            if (licenseFilePath != null) {
+                MicroblinkSDK.setLicenseFile(licenseFilePath, this);
             }
             MicroblinkSDK.setIntentDataTransferMode(IntentDataTransferMode.PERSISTED_OPTIMISED);
         }
@@ -50,6 +50,6 @@ public void onCreate() {
 
     protected abstract BaseResultExtractorFactory createResultExtractorFactory();
 
-    protected abstract String getLicenseKey();
+    protected abstract String getLicenceFilePath();
 
 }

BlinkIDSample/LibUtils/src/main/assets/com.microblink.blinkid.mblic

@@ -25,7 +25,7 @@ allprojects {
 // versions of libraries that all modules require
 
 project.ext {
-    blinkIdVersion = '6.6.0'
+    blinkIdVersion = '6.6.1'
     compileSdkVersion = 34
     targetSdkVersion = 34
     appCompatVersion = '1.6.1'

BlinkIDSample/LibUtils/src/main/java/com/microblink/BlinkIdSampleApp.java

@@ -114,7 +114,7 @@ Add _BlinkID_ as a dependency and make sure `transitive` is set to true
 
 ```
 dependencies {
-    implementation('com.microblink:blinkid:6.6.0@aar') {
+    implementation('com.microblink:blinkid:6.6.1@aar') {
         transitive = true
     }
 }
@@ -126,7 +126,7 @@ Android studio should automatically import javadoc from maven dependency. If tha
 
 1. In Android Studio project sidebar, ensure [project view is enabled](https://developer.android.com/studio/projects#ProjectView)
 2. Expand `External Libraries` entry (usually this is the last entry in project view)
-3. Locate `blinkid-6.6.0` entry, right click on it and select `Library Properties...`
+3. Locate `blinkid-6.6.1` entry, right click on it and select `Library Properties...`
 4. A `Library Properties` pop-up window will appear
 5. Click the second `+` button in bottom left corner of the window (the one that contains `+` with little globe)
 6. Window for defining documentation URL will appear

BlinkIDSample/LibUtils/src/main/java/com/microblink/blinkid/SampleApplication.java

@@ -1,5 +1,12 @@
 # Release notes
 
+## v6.6.1
+
+- fixed URL of the server performing online license check when it's enabled
+  - in v9.1.1 the URL depended on the `BUILD_TYPE` property, pointing to production server only when `BUILD_TYPE` was set to `distribute`. However, apparently the `BUILD_TYPE` is not a compile-time property on Android like it's on other platforms and native code, so it was affected by the setting of the app that was integrating the SDK and that caused the SDK to call to a dev server which is unavailable from the external network
+- added `android.permission.INTERNET` permission to the manifest of `LibBlinkID`
+  - this permission is needed in order to correctly perform license key validation for licenses that require that
+
 ## v6.6.0
 
 ### Document Updates
@@ -118,7 +125,7 @@
 - Splitting up `Image` class to `Image` and `InputImage`.`InputImage` is to be used as an input to the recognizers. `Image` will be the result of recognizer processing.
 
 #### Bugfixes
-- Fixed `Background ANR at jdk.internal.misc.Unsafe.park` that would happen in rare cases 
+- Fixed `Background ANR at jdk.internal.misc.Unsafe.park` that would happen in rare cases
 
 
 ## v6.5.1

BlinkIDSample/build.gradle

@@ -1 +1 @@
-Built from commit 6ee9bbf0226d1b67fa63542579075023695a711a
+Built from commit 5dd6a70f4dd2d45b04d7bc21a5f0114e9f0e16a3

LibBlinkID-javadoc.jar

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microblink</groupId>
   <artifactId>blinkid</artifactId>
-  <version>6.6.0</version>
+  <version>6.6.1</version>
   <packaging>aar</packaging>
   <name>BlinkID SDK for Android</name>
   <description>SDK that enables scanning of ID documents and passports in your Android application</description>