Merge pull request #718 from rokwire/feature/issue-717

Feature/issue 717
rokwire · Sep 29, 2021 · 8c1537c · 8c1537c
2 parents 8b1df74 + 3d0f584
commit 8c1537c
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 3,611 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ### Deleted
 - Removed vaccine taken event handling [#715](https://github.com/rokwire/safer-illinois-app/issues/715).
+- Removed MicroBlink scan support [#717](https://github.com/rokwire/safer-illinois-app/issues/717).
 
 ## [2.11.2] - 2021-09-24
 ### Changed

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -163,11 +163,6 @@ dependencies {
     implementation 'com.google.zxing:core:3.3.0' //Use zxing 3.3.0 because we have minSdk < 24
     implementation ('com.journeyapps:zxing-android-embedded:4.1.0@aar') { transitive = false }
 
-    //BlinkID
-    implementation('com.microblink:blinkid:5.3.0@aar') {
-        transitive = true
-    }
-
     // BLESSED - BLE library used for Exposures
     implementation 'com.github.weliem:blessed-android:1.19'
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -39,11 +39,6 @@
     <!-- save_in_gallery flutter plugin -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!-- BlinkID -->
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-    <uses-feature android:glEsVersion="0x00020000" android:required="false" />
 
     <!-- Exposure BLE -->
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />

diff --git a/android/app/src/main/java/edu/illinois/covid/Constants.java b/android/app/src/main/java/edu/illinois/covid/Constants.java
@@ -32,7 +32,6 @@ public class Constants {
     static final String APP_DISMISS_SAFARI_VC_KEY = "dismissSafariVC";
     static final String APP_DISMISS_LAUNCH_SCREEN_KEY = "dismissLaunchScreen";
     static final String APP_ADD_CARD_TO_WALLET_KEY = "addToWallet";
-    static final String APP_MICRO_BLINK_SCAN_KEY = "microBlinkScan";
     static final String APP_ENABLED_ORIENTATIONS_KEY = "enabledOrientations";
     static final String APP_NOTIFICATIONS_AUTHORIZATION = "notifications_authorization";
     static final String APP_LOCATION_SERVICES_PERMISSION = "location_services_permission";

diff --git a/android/app/src/main/java/edu/illinois/covid/MainActivity.java b/android/app/src/main/java/edu/illinois/covid/MainActivity.java
diff --git a/android/build.gradle b/android/build.gradle
@@ -38,7 +38,6 @@ allprojects {
         flatDir {
             dirs '../lib'
         }
-        maven { url 'https://maven.microblink.com' }
         maven { url 'https://jitpack.io' }
     }
 }

diff --git a/ios/Podfile b/ios/Podfile
@@ -34,7 +34,6 @@ target 'Runner' do
 
     pod 'GoogleMaps', '3.3.0'
     pod 'ZXingObjC', '3.6.4'
-    pod 'PPBlinkID', '~> 5.3.0'
     pod 'HKDFKit', '0.0.3'
 
 #   'Firebase/MLVisionBarcodeModel' is required by 'firebase_ml_vision' plugin from pubspec.yaml.

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -621,7 +621,6 @@
 				"${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework",
 				"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
 				"${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
-				"${PODS_ROOT}/PPBlinkID/Microblink.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
@@ -667,7 +666,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Microblink.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
@@ -709,12 +707,10 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
 				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
-				"${PODS_ROOT}/PPBlinkID/Microblink.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Microblink.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;