added v11.4.2

Acuant · Jul 9, 2020 · 515bffb · 515bffb
1 parent 6a7f26c
commit 515bffb
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# Acuant Android SDK v11.4.1
-**June 2020**
+# Acuant Android SDK v11.4.2
+**July 2020**
 
 See [https://github.com/Acuant/AndroidSDKV11/releases](https://github.com/Acuant/AndroidSDKV11/releases) for release notes.
 
@@ -163,18 +163,18 @@ The SDK includes the following modules:
         	
      - Add the following dependencies
 
-    		implementation 'com.acuant:acuantcommon:11.4.1'
-    		implementation 'com.acuant:acuantcamera:11.4.1'
-    		implementation 'com.acuant:acuantimagepreparation:11.4.1'
-    		implementation 'com.acuant:acuantdocumentprocessing:11.4.1'
-    		implementation 'com.acuant:acuantechipreader:11.4.1'
-    		implementation 'com.acuant:acuantfacematch:11.4.1'
-    		implementation 'com.acuant:acuanthgliveness:11.4.1'
-    		implementation ('com.acuant:acuantipliveness:11.4.1'){
+    		implementation 'com.acuant:acuantcommon:11.4.2'
+    		implementation 'com.acuant:acuantcamera:11.4.2'
+    		implementation 'com.acuant:acuantimagepreparation:11.4.2'
+    		implementation 'com.acuant:acuantdocumentprocessing:11.4.2'
+    		implementation 'com.acuant:acuantechipreader:11.4.2'
+    		implementation 'com.acuant:acuantfacematch:11.4.2'
+    		implementation 'com.acuant:acuanthgliveness:11.4.2'
+    		implementation ('com.acuant:acuantipliveness:11.4.2'){
         		transitive = true
     		}
-    		implementation 'com.acuant:acuantfacecapture:11.4.1'
-    		implementation 'com.acuant:acuantpassiveliveness:11.4.1'
+    		implementation 'com.acuant:acuantfacecapture:11.4.2'
+    		implementation 'com.acuant:acuantpassiveliveness:11.4.2'
 		
 	- Acuant also relies on Google Play services dependencies, which are pre-installed on almost all Android devices.
 

diff --git a/acuantcamera/src/main/java/com/acuant/acuantcamera/camera/AcuantBaseCameraFragment.kt b/acuantcamera/src/main/java/com/acuant/acuantcamera/camera/AcuantBaseCameraFragment.kt
@@ -204,8 +204,8 @@ abstract class AcuantBaseCameraFragment : Fragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
     ): View? = inflater.inflate(R.layout.fragment_camera2_basic, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -257,8 +257,8 @@ abstract class AcuantBaseCameraFragment : Fragment() {
     }
 
     override fun onRequestPermissionsResult(requestCode: Int,
-                                            permissions: Array<String>,
-                                            grantResults: IntArray) {
+            permissions: Array<String>,
+            grantResults: IntArray) {
         if (requestCode == REQUEST_CAMERA_PERMISSION) {
             if (grantResults.size != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
                 ErrorDialog.newInstance(getString(R.string.request_permission))

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
@@ -94,7 +94,7 @@ class AcuantDocCameraFragment : AcuantBaseCameraFragment(),
             }
 
             when {
-                croppedImage == null || croppedImage.dpi < MINIMUM_DPI -> {
+                 croppedImage == null || croppedImage.dpi < MINIMUM_DPI -> {
                     unlockFocus()
                     rectangleView.setViewFromState(CameraState.Align)
                     setTextFromState(CameraState.Align)

diff --git a/...src/main/java/com/acuant/acuantcamera/camera/document/cameraone/DocumentCameraSource.java b/...src/main/java/com/acuant/acuantcamera/camera/document/cameraone/DocumentCameraSource.java
@@ -857,22 +857,36 @@ private static int getIdForRequestedCamera(int facing) {
 
     private static SizePair selectSizePair(Camera camera, int desiredWidth, int desiredHeight) {
         List<SizePair> validPreviewSizes = generateValidPreviewSizeList(camera);
-
         // The method for selecting the best size is to minimize the sum of the differences between
         // the desired values and the actual values for width and height.  This is certainly not the
         // only way to select the best size, but it provides a decent tradeoff between using the
         // closest aspect ratio vs. using the closest pixel area.
         SizePair selectedPair = null;
         int maxArea = Integer.MIN_VALUE;
+        int maxPict = Integer.MIN_VALUE;
+        int area = Integer.MIN_VALUE;
         for (SizePair sizePair : validPreviewSizes) {
-            Size size = sizePair.previewSize();
-            int area = size.getWidth()*size.getHeight();
-            if (maxArea < area) {
-                selectedPair = sizePair;
-                maxArea = area;
+            Size size_pict = sizePair.pictureSize();
+            int newArea = size_pict.getWidth()*size_pict.getHeight();
+            if (newArea > maxPict) {
+                maxPict = newArea;
+                maxArea = Integer.MIN_VALUE;
+                Size size = sizePair.previewSize();
+                area = size.getWidth()*size.getHeight();
+                if (maxArea < area) {
+                    selectedPair = sizePair;
+                    maxArea = area;
+                }
+            }
+            else if (newArea == maxPict) {
+                Size size = sizePair.previewSize();
+                area = size.getWidth()*size.getHeight();
+                if (maxArea < area) {
+                    selectedPair = sizePair;
+                    maxArea = area;
+                }
             }
         }
-
         return selectedPair;
     }
 

diff --git a/...rc/main/java/com/acuant/acuantcamera/camera/document/cameraone/DocumentCaptureActivity.kt b/...rc/main/java/com/acuant/acuantcamera/camera/document/cameraone/DocumentCaptureActivity.kt
@@ -586,7 +586,7 @@ class DocumentCaptureActivity : AppCompatActivity(), DocumentCameraSource.Pictur
         val image = BitmapFactory.decodeByteArray(data, 0, data.size)
 
         if((image.width > image.height && this.lastOrientation == ORIENTATION_LANDSCAPE_REVERSE) ||
-                 (image.width < image.height && this.lastOrientation == ORIENTATION_LANDSCAPE)){
+                (image.width < image.height && this.lastOrientation == ORIENTATION_LANDSCAPE)){
             val rotated = ImageSaver.rotateImage(image, 180f)
             val stream = ByteArrayOutputStream()
             rotated.compress(Bitmap.CompressFormat.JPEG, 100, stream)

diff --git a/...mera/src/main/java/com/acuant/acuantcamera/camera/mrz/cameraone/DocumentCameraSource.java b/...mera/src/main/java/com/acuant/acuantcamera/camera/mrz/cameraone/DocumentCameraSource.java
@@ -859,22 +859,36 @@ private static int getIdForRequestedCamera(int facing) {
 
     private static SizePair selectSizePair(Camera camera, int desiredWidth, int desiredHeight) {
         List<SizePair> validPreviewSizes = generateValidPreviewSizeList(camera);
-
         // The method for selecting the best size is to minimize the sum of the differences between
         // the desired values and the actual values for width and height.  This is certainly not the
         // only way to select the best size, but it provides a decent tradeoff between using the
         // closest aspect ratio vs. using the closest pixel area.
         SizePair selectedPair = null;
         int maxArea = Integer.MIN_VALUE;
+        int maxPict = Integer.MIN_VALUE;
+        int area = Integer.MIN_VALUE;
         for (SizePair sizePair : validPreviewSizes) {
-            Size size = sizePair.previewSize();
-            int area = size.getWidth()*size.getHeight();
-            if (maxArea < area) {
-                selectedPair = sizePair;
-                maxArea = area;
+            Size size_pict = sizePair.pictureSize();
+            int newArea = size_pict.getWidth()*size_pict.getHeight();
+            if (newArea > maxPict) {
+                maxPict = newArea;
+                maxArea = Integer.MIN_VALUE;
+                Size size = sizePair.previewSize();
+                area = size.getWidth()*size.getHeight();
+                if (maxArea < area) {
+                    selectedPair = sizePair;
+                    maxArea = area;
+                }
+            }
+            else if (newArea == maxPict) {
+                Size size = sizePair.previewSize();
+                area = size.getWidth()*size.getHeight();
+                if (maxArea < area) {
+                    selectedPair = sizePair;
+                    maxArea = area;
+                }
             }
         }
-
         return selectedPair;
     }
 

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
@@ -1312,7 +1312,9 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
             c.setRequestProperty("Authorization", basicAuth)
             c.useCaches = false
             c.connect()
-            return BitmapFactory.decodeStream(c.inputStream)
+            val img = BitmapFactory.decodeStream(c.inputStream)
+            c.disconnect()
+            return img
         }
         return null
     }

diff --git a/app/src/main/java/com/acuant/sampleapp/NFCResultActivity.kt b/app/src/main/java/com/acuant/sampleapp/NFCResultActivity.kt
@@ -77,11 +77,15 @@ class NfcResultActivity : AppCompatActivity() {
     private fun setData(data: NfcData) {
         var key = "Given name"
         var value = data.firstName
+        var i = value.indexOf("<")
+        if (i > 0) {
+            value = value.substring(0, i)
+        }
         addField(key, value)
 
         key = "Surname"
         value = data.lastName
-        val i = value.indexOf("<")
+        i = value.indexOf("<")
         if (i > 0) {
             value = value.substring(0, i)
         }
@@ -108,7 +112,7 @@ class NfcResultActivity : AppCompatActivity() {
         addField(key, value)
 
         key = "Document type"
-        value = data.documentType.toString() + ""
+        value = data.documentType
         addField(key, value)
 
         key = "Issuing state"

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ allprojects {
         google()
         jcenter()
     }
-    version = '11.2.3'
+    version = '11.4.2'
     group = 'com.acuant' // Maven Group ID for the artifact
 }