added v11.4.16

Acuant · Sep 29, 2021 · 10d20ae · 10d20ae
1 parent ee7fb0e
commit 10d20ae
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# Acuant Android SDK v11.4.15
-**August 2021**
+# Acuant Android SDK v11.4.16
+**September 2021**
 
 See [https://github.com/Acuant/AndroidSDKV11/releases](https://github.com/Acuant/AndroidSDKV11/releases) for release notes.
 
@@ -189,18 +189,18 @@ The SDK includes the following modules:
         	
    - Add the following dependencies
 
-    		implementation 'com.acuant:acuantcommon:11.4.15'
-    		implementation 'com.acuant:acuantcamera:11.4.15'
-    		implementation 'com.acuant:acuantimagepreparation:11.4.15'
-    		implementation 'com.acuant:acuantdocumentprocessing:11.4.15'
-    		implementation 'com.acuant:acuantechipreader:11.4.15'
-    		implementation 'com.acuant:acuantfacematch:11.4.15'
-    		implementation 'com.acuant:acuanthgliveness:11.4.15'
-    		implementation ('com.acuant:acuantipliveness:11.4.15'){
+    		implementation 'com.acuant:acuantcommon:11.4.16'
+    		implementation 'com.acuant:acuantcamera:11.4.16'
+    		implementation 'com.acuant:acuantimagepreparation:11.4.16'
+    		implementation 'com.acuant:acuantdocumentprocessing:11.4.16'
+    		implementation 'com.acuant:acuantechipreader:11.4.16'
+    		implementation 'com.acuant:acuantfacematch:11.4.16'
+    		implementation 'com.acuant:acuanthgliveness:11.4.16'
+    		implementation ('com.acuant:acuantipliveness:11.4.16'){
         		transitive = true
     		}
-    		implementation 'com.acuant:acuantfacecapture:11.4.15'
-    		implementation 'com.acuant:acuantpassiveliveness:11.4.15'
+    		implementation 'com.acuant:acuantfacecapture:11.4.16'
+    		implementation 'com.acuant:acuantpassiveliveness:11.4.16'
 
    - Acuant also relies on Google Play services dependencies, which are pre-installed on almost all Android devices.
 
@@ -914,13 +914,38 @@ Relevant Enums:
 
 ### IdOptions ###
 
-			public class IdOptions {
-				public CardSide cardSide;
-				public boolean isRetrying;
-				public boolean isHealthCard;
-				public AuthenticationSensitivity authenticationSensitivity;
-				public TamperSensitivity tamperSensitivity;
-			}
+		public class IdOptions {
+			public CardSide cardSide;
+			public boolean isRetrying;
+			public boolean isHealthCard;
+			public AuthenticationSensitivity authenticationSensitivity;
+			public TamperSensitivity tamperSensitivity;
+		}
+		
+### NfcData (used in eChip workflow) ###
+
+		public class NfcData {
+			var dateOfBirth: String
+			var documentExpiryDate: String
+			var documentCode: String
+			var issuingAuthority: String
+			var documentNumber: String
+			var nationality: String
+			var personalNumber: String
+			var firstName: String
+			var lastName: String
+			var documentType: String 
+			var documentSubType: String 
+			var gender: String 
+			val age: Int? //extrapolated
+			val isExpired: Boolean? //extrapolated
+			var image: Bitmap?
+			var passportDataValid: Boolean //Data Group Hash Check Status
+			var passportCountrySigned: OzoneResultStatus
+			var passportSigned: OzoneResultStatus
+			
+			fun getBytes(group: ByteGroup?): ByteArray?
+		}
 
 -------------------------------------
 

diff --git a/acuantcamera/src/main/java/com/acuant/acuantcamera/camera/AcuantBaseCameraFragment.kt b/acuantcamera/src/main/java/com/acuant/acuantcamera/camera/AcuantBaseCameraFragment.kt
@@ -335,13 +335,14 @@ abstract class AcuantBaseCameraFragment : Fragment() {
             if (image != null) {
                 if (!isCapturing) {
                     try {
-                        AcuantDetectorWorker(detectors, image, isAutoCapture).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+                        AcuantDetectorWorker(detectors, imageToBitmap(image), isAutoCapture).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
                     }
                     catch(e:Exception){
+                        image.close()
                         e.printStackTrace()
                     }
                 }
-                else{
+                else {
                     image.close()
                 }
             }
@@ -350,6 +351,13 @@ abstract class AcuantBaseCameraFragment : Fragment() {
         }
     }
 
+    private fun imageToBitmap(image: Image) : Bitmap {
+        val imageBytes = ImageSaver.imageToByteArray(image)
+        val bitmap =  BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+        image.close()
+        return bitmap
+    }
+
     /**
      * Called only once when the camera deems the id to be properly positioned and
      * is ready to take a photo
@@ -370,8 +378,7 @@ abstract class AcuantBaseCameraFragment : Fragment() {
                             }
                         }
                     }))
-                }
-                else{
+                } else {
                     image.close()
                 }
             }

diff --git a/...amera/src/main/java/com/acuant/acuantcamera/camera/barcode/AcuantBarcodeCameraFragment.kt b/...amera/src/main/java/com/acuant/acuantcamera/camera/barcode/AcuantBarcodeCameraFragment.kt
@@ -62,13 +62,6 @@ class AcuantBarcodeCameraFragment : AcuantBaseCameraFragment(),
 
     override fun onBarcodeDetected(barcode: String) {
         this.barCodeString = barcode
-        detectors.forEach {
-            if (it is AcuantBarcodeDetector) {
-                it.isProcessing = false
-            }
-        }
-
-        Log.d("BarcodeCamera","Barcode Detected, Done: $done")
         if (!done) {
             done = true
             activity?.runOnUiThread {
@@ -80,7 +73,7 @@ class AcuantBarcodeCameraFragment : AcuantBaseCameraFragment(),
                     }
 
                     override fun onTick(millisUntilFinished: Long) {
-                        Log.d("BarcodeCamera","Capturing: $millisUntilFinished")
+                        //do nothing
                     }
                 }.start()
             }

diff --git a/...ntcamera/src/main/java/com/acuant/acuantcamera/camera/document/AcuantDocCameraFragment.kt b/...ntcamera/src/main/java/com/acuant/acuantcamera/camera/document/AcuantDocCameraFragment.kt
@@ -4,6 +4,7 @@ import android.graphics.*
 import android.graphics.drawable.Drawable
 import android.os.*
 import android.support.v4.app.ActivityCompat
+import android.util.Log
 import android.util.Size
 import android.util.SparseIntArray
 import android.view.*
@@ -238,13 +239,8 @@ class AcuantDocCameraFragment : AcuantBaseCameraFragment(),
         currentDigit = digitsToShow
     }
 
-    override fun onBarcodeDetected(barcode: String){
+    override fun onBarcodeDetected(barcode: String) {
         this.barCodeString = barcode
-        detectors.forEach {
-            if (it is AcuantBarcodeDetector) {
-                it.isProcessing = false
-            }
-        }
     }
 
     override fun onCreateView(inflater: LayoutInflater,

diff --git a/acuantcamera/src/main/java/com/acuant/acuantcamera/camera/mrz/AcuantMrzCameraFragment.kt b/acuantcamera/src/main/java/com/acuant/acuantcamera/camera/mrz/AcuantMrzCameraFragment.kt
@@ -15,7 +15,6 @@ import com.acuant.acuantcamera.camera.AcuantBaseCameraFragment
 import com.acuant.acuantcamera.camera.AcuantCameraOptions
 import com.acuant.acuantcamera.camera.ICameraActivityFinish
 import com.acuant.acuantcamera.constant.ACUANT_EXTRA_CAMERA_OPTIONS
-import com.acuant.acuantcamera.detector.barcode.AcuantBarcodeDetector
 import com.acuant.acuantcamera.detector.ocr.AcuantOcrDetector
 import com.acuant.acuantcamera.detector.ocr.AcuantOcrDetectorHandler
 import com.acuant.acuantcamera.helper.MrzParser

diff --git a/acuantcamera/src/main/java/com/acuant/acuantcamera/detector/AcuantDetectorWorker.kt b/acuantcamera/src/main/java/com/acuant/acuantcamera/detector/AcuantDetectorWorker.kt
@@ -1,37 +1,19 @@
 package com.acuant.acuantcamera.detector
 
 import android.graphics.*
-import android.media.Image
 import android.os.AsyncTask
 import com.acuant.acuantcamera.detector.document.AcuantDocumentDetector
-import java.lang.Exception
 import kotlin.concurrent.thread
 
-class AcuantDetectorWorker(private val detectors: List<IAcuantDetector>, private val image: Image, private val runDocumentDetection: Boolean = true): AsyncTask<Void, Void, Void>(){
+class AcuantDetectorWorker(private val detectors: List<IAcuantDetector>, private val bitmap: Bitmap, private val runDocumentDetection: Boolean = true): AsyncTask<Void, Void, Void>(){
     override fun doInBackground(vararg params: Void?): Void? {
-        var bitmap:Bitmap? = null
-        try{
-            bitmap = imageToBitmap(image)
-        }
-        catch(e:Exception){
-            e.printStackTrace()
-        }
-        finally {
-            image.close()
-
-            detectors.forEach{
-                if (runDocumentDetection || it !is AcuantDocumentDetector) {
-                    thread {
-                        it.detect(bitmap)
-                    }
+        detectors.forEach{
+            if (runDocumentDetection || it !is AcuantDocumentDetector) {
+                thread {
+                    it.detect(bitmap)
                 }
             }
         }
         return null
     }
-
-    private fun imageToBitmap(image: Image):Bitmap {
-        val imageBytes = ImageSaver.imageToByteArray(image)
-        return BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
-    }
 }
diff --git a/acuantcamera/src/main/java/com/acuant/acuantcamera/detector/barcode/AcuantBarcodeDetector.kt b/acuantcamera/src/main/java/com/acuant/acuantcamera/detector/barcode/AcuantBarcodeDetector.kt
@@ -9,7 +9,7 @@ import com.acuant.acuantcamera.detector.barcode.tracker.BarcodeTrackerFactory
 import com.google.android.gms.vision.MultiProcessor
 import com.google.android.gms.vision.Frame
 
-
+//NOTE: this class does not use the isProcessing flag due to difficulties with how the gms barcode detector does its callbacks
 class AcuantBarcodeDetector(context: Context, callback: AcuantBarcodeDetectorHandler) : BaseAcuantDetector() {
     private lateinit var barcodeDetector: BarcodeDetector
     private var isInitialized = false
@@ -26,7 +26,7 @@ class AcuantBarcodeDetector(context: Context, callback: AcuantBarcodeDetectorHan
     }
 
     override fun detect(bitmap: Bitmap?) {
-        if (isInitialized && bitmap != null && !isProcessing) {
+        if (isInitialized && bitmap != null) {
             try {
                 barcodeDetector.receiveFrame(Frame.Builder()
                         .setBitmap(bitmap)

diff --git a/...ra/src/main/java/com/acuant/acuantcamera/detector/barcode/tracker/AcuantBarcodeTracker.kt b/...ra/src/main/java/com/acuant/acuantcamera/detector/barcode/tracker/AcuantBarcodeTracker.kt
@@ -19,8 +19,6 @@ package com.acuant.acuantcamera.detector.barcode.tracker
 
 import android.util.Log
 import com.acuant.acuantcamera.detector.barcode.AcuantBarcodeDetectorHandler
-import com.google.android.gms.vision.Detector.Detections
-
 import com.google.android.gms.vision.Tracker
 import com.google.android.gms.vision.barcode.Barcode
 

diff --git a/...tcamera/src/main/java/com/acuant/acuantcamera/detector/document/AcuantDocumentDetector.kt b/...tcamera/src/main/java/com/acuant/acuantcamera/detector/document/AcuantDocumentDetector.kt
@@ -13,6 +13,7 @@ class AcuantDocumentDetector constructor (private val callback: AcuantDocumentDe
 
     override fun detect(bitmap: Bitmap?) {
         if (!isProcessing) {
+            isProcessing = true
             val cropStart = System.currentTimeMillis()
             var croppedImage: Image? = null
 
@@ -23,6 +24,7 @@ class AcuantDocumentDetector constructor (private val callback: AcuantDocumentDe
                     croppedImage = AcuantImagePreparation.detect(data)
                 } catch (e: Exception) {
                     e.printStackTrace()
+                    isProcessing = false
                 }
             }
             callback.onDetected(croppedImage, System.currentTimeMillis() - cropStart)

diff --git a/acuantcommon/acuantcommon.aar b/acuantcommon/acuantcommon.aar
diff --git a/acuantdocumentprocessing/acuantdocumentprocessing.aar b/acuantdocumentprocessing/acuantdocumentprocessing.aar
diff --git a/acuantechipreader/acuantechipreader.aar b/acuantechipreader/acuantechipreader.aar
diff --git a/acuantfacematch/acuantfacematch.aar b/acuantfacematch/acuantfacematch.aar
diff --git a/acuantimagepreparation/acuantimagepreparation.aar b/acuantimagepreparation/acuantimagepreparation.aar
diff --git a/acuantipliveness/acuantipliveness.aar b/acuantipliveness/acuantipliveness.aar
diff --git a/acuantpassiveliveness/acuantpassiveliveness.aar b/acuantpassiveliveness/acuantpassiveliveness.aar
diff --git a/app/src/main/java/com/acuant/sampleapp/MainActivity.kt b/app/src/main/java/com/acuant/sampleapp/MainActivity.kt
@@ -1356,13 +1356,12 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener, IP
 
     fun loadAssureIDImage(url: String?, credential: Credential?): Bitmap? {
         if (url != null && credential != null) {
-            val c = URL(url).openConnection() as HttpURLConnection
-            val auth = CredentialHelper.getAcuantAuthHeader(credential)
-            c.setRequestProperty("Authorization", auth)
-            c.useCaches = false
-            c.connect()
-            val img = BitmapFactory.decodeStream(c.inputStream)
-            c.disconnect()
+            val conn = URL(url).openConnection() as HttpURLConnection
+            conn.setRequestProperty("Authorization", CredentialHelper.getAcuantAuthHeader(credential))
+            conn.useCaches = false
+            conn.connect()
+            val img = BitmapFactory.decodeStream(conn.inputStream)
+            conn.disconnect()
             return img
         }
         return null

diff --git a/app/src/main/java/com/acuant/sampleapp/backgroundtasks/AcuantTokenService.kt b/app/src/main/java/com/acuant/sampleapp/backgroundtasks/AcuantTokenService.kt
@@ -2,7 +2,7 @@ package com.acuant.sampleapp.backgroundtasks
 
 import android.os.AsyncTask
 import com.acuant.acuantcommon.model.Credential
-import android.util.Base64
+import com.acuant.acuantcommon.helper.CredentialHelper
 import org.json.JSONObject
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -29,9 +29,7 @@ class AcuantTokenService(private val credential: Credential,
             val conn = url.openConnection() as HttpURLConnection
             try {
                 conn.requestMethod = "POST"
-                val sub = if (credential.subscription != null && credential.subscription != "") "${credential.subscription};" else ""
-                val auth = Base64.encodeToString("$sub${credential.username}:${credential.password}".toByteArray(), Base64.NO_WRAP)
-                conn.setRequestProperty("Authorization", "Basic $auth")
+                conn.setRequestProperty("Authorization", CredentialHelper.getAcuantAuthHeader(credential))
                 conn.setRequestProperty("Accept", "application/json")
                 conn.addRequestProperty("Cache-Control", "no-cache")
                 conn.addRequestProperty("Cache-Control", "max-age=0")

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -107,12 +107,12 @@
     <string name="classification_error">Could not classify the document</string>
 
     <string name="scan_back_side_id">Scan back side of document.</string>
-    <string name="scan_back_side_health_insurance_card">Capture back side of health insurance card.</string>
+    <string name="scan_back_side_health_insurance_card">Capture back side of medical insurance card.</string>
 
     <string name="classification_error_retry">Retry</string>
     <string name="classification_error_image_preview">Image Preview</string>
     <string name="id_passport_button_text">ID/Passport</string>
-    <string name="health_insurance_button_text">Health Insurance Card</string>
+    <string name="health_insurance_button_text">Medical Insurance Card</string>
     <string name="auto_capture">Auto Capture</string>
     <string name="ip_liveness_enabled">IP Liveness Enabled</string>
     <string name="face_capture_button_text">Face Capture</string>