Skip to content

Commit

Permalink
Merge pull request #112 from BlinkID/release/v4.11.0
Browse files Browse the repository at this point in the history
Release/v4.11.0
  • Loading branch information
juraskrlec authored Aug 21, 2019
2 parents 9e15cfb + 221bef7 commit d4f99ba
Show file tree
Hide file tree
Showing 32 changed files with 1,013 additions and 48 deletions.
2 changes: 1 addition & 1 deletion BlinkID/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "blinkid-cordova",
"version": "4.10.0",
"version": "4.11.0",
"description": "A small and powerful ID card scanning library",
"cordova": {
"id": "blinkid-cordova",
Expand Down
14 changes: 13 additions & 1 deletion BlinkID/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="4.10.0">
version="4.11.0">

<name>BlinkIdScanner</name>
<description>A small and powerful ID card scanning library</description>
Expand Down Expand Up @@ -80,6 +80,7 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SuccessFrameGrabberRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/AustraliaDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BelgiumIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/KuwaitIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MoroccoIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaMyKadBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand All @@ -91,6 +92,7 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/JordanIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SwitzerlandIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiMilitaryIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BelgiumCombinedRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MrtdRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiTemporaryResidencePermitBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand Down Expand Up @@ -118,6 +120,7 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SimNumberRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiResidencePermitBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/SingaporeIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BelgiumIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiResidencePermitFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaMyPrFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/GermanyIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand Down Expand Up @@ -155,6 +158,7 @@
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaDlFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/CyprusOldIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/MalaysiaMyTenteraFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/VisaRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/BruneiIdBackRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/AustriaIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
<source-file src="src/android/java/com/phonegap/plugins/microblink/recognizers/serialization/IndonesiaIdFrontRecognizerSerialization.java" target-dir="src/com/phonegap/plugins/microblink/recognizers/serialization" />
Expand Down Expand Up @@ -219,6 +223,7 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBUnitedArabEmiratesIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSimNumberRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBUnitedArabEmiratesDlFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBelgiumIdBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSwitzerlandIdFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeDlFrontRecognizerWrapper.h" />
Expand Down Expand Up @@ -250,9 +255,11 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyKasFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBRomaniaIdFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyKadBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBVisaRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBlinkCardEliteRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBAustriaDlFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBJordanIdBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBelgiumIdFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBarcodeRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBlinkIdCombinedRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBCroatiaIdFrontRecognizerWrapper.h" />
Expand All @@ -269,6 +276,7 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBPolandIdBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBruneiIdBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBVinRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBelgiumCombinedRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyPrFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyKadFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeIdBackRecognizerWrapper.m" />
Expand Down Expand Up @@ -303,6 +311,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSwitzerlandIdFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeDlFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBelgiumIdBackRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBUnitedArabEmiratesIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBCyprusOldIdFrontRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSimNumberRecognizerWrapper.h" />
Expand All @@ -320,6 +329,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBGermanyIdOldRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBAustraliaDlBackRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSloveniaCombinedRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBVisaRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBRomaniaIdFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyKasFrontRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyKadBackRecognizerWrapper.m" />
Expand Down Expand Up @@ -357,6 +367,7 @@
<header-file src="src/ios/sources/Recognizers/Wrappers/MBSingaporeIdBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyKadFrontRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMalaysiaMyPrFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBelgiumCombinedRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBUsdlRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBPolandIdBackRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBVinRecognizerWrapper.h" />
Expand All @@ -372,6 +383,7 @@
<source-file src="src/ios/sources/Recognizers/Wrappers/MBSuccessFrameGrabberRecognizerWrapper.m" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBCroatiaIdFrontRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBMrtdRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBBelgiumIdFrontRecognizerWrapper.h" />
<source-file src="src/ios/sources/Recognizers/Wrappers/MBBarcodeRecognizerWrapper.m" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBJordanIdBackRecognizerWrapper.h" />
<header-file src="src/ios/sources/Recognizers/Wrappers/MBAustriaDlFrontRecognizerWrapper.h" />
Expand Down
2 changes: 1 addition & 1 deletion BlinkID/scripts/initIOSFramework.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/v4.10.0/blinkid-ios_v4.10.0.zip'
LINK='https://github.com/BlinkID/blinkid-ios/releases/download/v4.11.0/blinkid-ios_v4.11.0.zip'
FILENAME='blinkid-ios.zip'

# check if Microblink framework and bundle already exist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import android.content.Intent;

import com.microblink.MicroblinkSDK;
import com.microblink.intent.IntentDataTransferMode;
import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.intent.IntentDataTransferMode;
import com.microblink.uisettings.UISettings;
import com.phonegap.plugins.microblink.overlays.OverlaySettingsSerializers;
import com.phonegap.plugins.microblink.recognizers.RecognizerSerializers;
Expand Down Expand Up @@ -76,7 +76,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo

setLicense(jsonLicenses);
mRecognizerBundle = RecognizerSerializers.INSTANCE.deserializeRecognizerCollection(jsonRecognizerCollection);
UISettings overlaySettings = OverlaySettingsSerializers.INSTANCE.getOverlaySettings(jsonOverlaySettings, mRecognizerBundle);
UISettings overlaySettings = OverlaySettingsSerializers.INSTANCE.getOverlaySettings(this.cordova.getContext(), jsonOverlaySettings, mRecognizerBundle);

// unable to use ActivityRunner because we need to use cordova's activity launcher
Intent intent = new Intent(this.cordova.getContext(), overlaySettings.getTargetActivity());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.phonegap.plugins.microblink.overlays;

import android.content.Context;

import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.uisettings.UISettings;

import org.json.JSONObject;

public interface OverlaySettingsSerialization {

UISettings createUISettings(JSONObject jsonUISettings, RecognizerBundle recognizerBundle);
UISettings createUISettings(Context context, JSONObject jsonUISettings, RecognizerBundle recognizerBundle);

String getJsonName();
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.phonegap.plugins.microblink.overlays;

import android.content.Context;

import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.uisettings.UISettings;
Expand Down Expand Up @@ -27,9 +28,9 @@ private void registerMapping(OverlaySettingsSerialization overlaySettingsSeriali
registerMapping(new BlinkIdOverlaySettingsSerialization());
}

public UISettings getOverlaySettings(JSONObject jsonOverlaySettings, RecognizerBundle recognizerBundle) {
public UISettings getOverlaySettings(Context context, JSONObject jsonOverlaySettings, RecognizerBundle recognizerBundle) {
try {
return mByJSONName.get(jsonOverlaySettings.getString("overlaySettingsType")).createUISettings(jsonOverlaySettings, recognizerBundle);
return mByJSONName.get(jsonOverlaySettings.getString("overlaySettingsType")).createUISettings(context, jsonOverlaySettings, recognizerBundle);
} catch (JSONException e) {
throw new RuntimeException(e);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.phonegap.plugins.microblink.overlays.serialization;

import android.content.Context;

import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.uisettings.BarcodeUISettings;
import com.microblink.uisettings.UISettings;
Expand All @@ -9,7 +11,7 @@

public final class BarcodeOverlaySettingsSerialization implements OverlaySettingsSerialization {
@Override
public UISettings createUISettings(JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
public UISettings createUISettings(Context context, JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
// no settings deserialized at the moment
return new BarcodeUISettings(recognizerBundle);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.phonegap.plugins.microblink.overlays.serialization;

import android.content.Context;

import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.fragment.overlay.blinkcard.scanlineui.ScanLineOverlayStrings;
import com.microblink.uisettings.BlinkCardUISettings;
import com.microblink.uisettings.UISettings;
import com.phonegap.plugins.microblink.overlays.OverlaySettingsSerialization;
Expand All @@ -9,26 +12,28 @@

public final class BlinkCardOverlaySettingsSerialization implements OverlaySettingsSerialization {
@Override
public UISettings createUISettings(JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
public UISettings createUISettings(Context context, JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
BlinkCardUISettings settings = new BlinkCardUISettings(recognizerBundle);

ScanLineOverlayStrings.Builder overlayStringsBuilder = new ScanLineOverlayStrings.Builder(context);
String firstSideInstructions = getStringFromJSONObject(jsonUISettings, "firstSideInstructions");
if (firstSideInstructions != null) {
settings.setFirstSideInstructions(firstSideInstructions);
overlayStringsBuilder.setFrontSideInstructions(firstSideInstructions);
}
String secondSideInstructions = getStringFromJSONObject(jsonUISettings, "secondSideInstructions");
if (secondSideInstructions != null) {
settings.setSecondSideInstructions(secondSideInstructions);
overlayStringsBuilder.setBackSideInstructions(secondSideInstructions);
}

settings.setStrings(overlayStringsBuilder.build());
return settings;
}

private String getStringFromJSONObject(JSONObject map, String key) {
String value = map.optString(key, null);
if ("null".equals(value)) {
value = null;
}
String value = map.optString(key, null);
if ("null".equals(value)) {
value = null;
}
return value;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.phonegap.plugins.microblink.overlays.serialization;

import android.content.Context;

import com.microblink.entities.recognizers.RecognizerBundle;
import com.microblink.uisettings.BlinkIdUISettings;
import com.microblink.uisettings.UISettings;
Expand All @@ -9,7 +11,7 @@

public final class BlinkIdOverlaySettingsSerialization implements OverlaySettingsSerialization {
@Override
public UISettings createUISettings(JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
public UISettings createUISettings(Context context, JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
// no settings deserialized at the moment
return new BlinkIdUISettings(recognizerBundle);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.phonegap.plugins.microblink.overlays.serialization;

import android.content.Context;

import com.microblink.entities.recognizers.RecognizerBundle;;
import com.microblink.uisettings.DocumentUISettings;
import com.microblink.uisettings.UISettings;
Expand All @@ -9,7 +11,7 @@

public final class DocumentOverlaySettingsSerialization implements OverlaySettingsSerialization {
@Override
public UISettings createUISettings(JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
public UISettings createUISettings(Context context, JSONObject jsonUISettings, RecognizerBundle recognizerBundle) {
// no settings deserialized at the moment
return new DocumentUISettings(recognizerBundle);
}
Expand Down
Loading

0 comments on commit d4f99ba

Please sign in to comment.