Merge pull request #34 from getyoti/DEP-267

[DEP-267] Release 2.8.1

Author: mariasenosiain

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 All notable changes to this project will be documented in this file.
+## [2.8.1] - 2022-03-07
+### Fixed
+- Manifest merge issue solved.
+
+## [2.8.0] - 2022-03-02
+## Critical issue detected on this version (Manifest merge issue on client side), please use 2.8.1
+### Added
+- Support for Filipino Phil Sys ID & UMID.
+- Support for Young Scot Card.  
+- Improvements on document upload feedback: quality error detection. 
+- Improvements on NFC scan flow.  
+
 ## [2.7.0] - 2021-09-21
 ### Added
 - New verification step: Face capture. With it users can provide a selfie of themselves for face match check (ID document photo vs face capture) 

README.md

@@ -55,16 +55,16 @@ Add modules you require to your build.gradle:
 ```groovy
 dependencies {
     //If you need document capture
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.7.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.8.1'
     
     //If you need supplementary documents
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan-sup:2.7.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan-sup:2.8.1'
 
     //If you need liveness
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.7.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.8.1'
     
     //If you need selfie capture
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-facecapture:2.7.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-facecapture:2.8.1'
 }
 ```
 
@@ -191,6 +191,7 @@ class MainActivity : AppCompatActivity() {
 | 3001              | An error occurred during a network request          | Yes |
 | 3002              | User has no network          | Yes |
 | 4000              | The user did not grant permissions to the camera          | Yes |
+| 4001              | User Wrong submission          | Yes |
 | 5000              | No camera (when user's camera was not found and file upload is not allowed)          | No |
 | 5002              | No more local tries for the liveness flow          | Yes |
 | 5003              | SDK is out-of-date - please update the SDK to the latest version          | No |

app/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.yoti.mobile.android.sdk.yotidocscan.sample"
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 270
-        versionName "2.7.0"
+        targetSdkVersion 31
+        versionCode 281
+        versionName "2.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -23,6 +22,10 @@ android {
         targetCompatibility = '1.8'
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -32,19 +35,19 @@ android {
                     'proguard-rules-retrofit.pro'
         }
         debug {
-             matchingFallbacks = ['release']
+            matchingFallbacks = ['release']
         }
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
 
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.7.0'
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan-sup:2.7.0'
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.7.0'
-    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-facecapture:2.7.0'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan:2.8.1'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-doc-scan-sup:2.8.1'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-liveness-zoom:2.8.1'
+    implementation 'com.yoti.mobile.android.sdk:yoti-sdk-facecapture:2.8.1'
 }

app/src/main/AndroidManifest.xml

@@ -3,13 +3,14 @@
 
     <application
         android:allowBackup="true"
+        android:supportsRtl="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <activity android:name="com.yoti.mobile.android.sdk.yotidocscan.sample.MainActivity">
+        <activity android:name="com.yoti.mobile.android.sdk.yotidocscan.sample.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/sample/MainActivity.kt

@@ -3,33 +3,39 @@ package com.yoti.mobile.android.sdk.yotidocscan.sample
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.yoti.mobile.android.sdk.yotidocscan.sample.databinding.ActivityMainBinding
 import com.yoti.mobile.android.yotisdkcore.YOTI_SDK_REQUEST_CODE
 import com.yoti.mobile.android.yotisdkcore.YotiSdk
-import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var yotiSdk: YotiSdk
 
+    private lateinit var binding: ActivityMainBinding
+
     private var sessionId: String = ""
     private var sessionToken: String = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
 
-        edSessionId.setText(sessionId)
-        edTokenId.setText(sessionToken)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        with(binding) {
+            edSessionId.setText(sessionId)
+            edTokenId.setText(sessionToken)
 
-        yotiSdk = YotiSdk(this)
+            yotiSdk = YotiSdk(this@MainActivity)
 
-        buttonScanDocument.setOnClickListener {
-            val success = yotiSdk
-                .setSessionId(edSessionId.text.toString())
-                .setClientSessionToken(edTokenId.text.toString())
-                .start(this) // Custom request code .start(this, 8888)
-            if (!success) {
-                showSessionStatus()
+            buttonScanDocument.setOnClickListener {
+                val success = yotiSdk
+                        .setSessionId(edSessionId.text.toString())
+                        .setClientSessionToken(edTokenId.text.toString())
+                        .start(this@MainActivity) // Custom request code .start(this, 8888)
+                if (!success) {
+                    showSessionStatus()
+                }
             }
         }
     }
@@ -45,6 +51,6 @@ class MainActivity : AppCompatActivity() {
     private fun showSessionStatus() {
         val code = yotiSdk.sessionStatusCode
         val description = yotiSdk.sessionStatusDescription
-        sessionStatusText.text = getString(R.string.session_status_text, code, description)
+        binding.sessionStatusText.text = getString(R.string.session_status_text, code, description)
     }
 }

build.gradle

@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
-        
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +17,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://maven.microblink.com' }
         maven { url "https://jitpack.io" }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

webapp/build.gradle

@@ -1,10 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.yoti.mobile.android.sdk.yotidocscan.websample"
@@ -16,6 +14,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled false

webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/MainActivity.kt

@@ -23,7 +23,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import com.yoti.mobile.android.sdk.yotidocscan.websample.AccelerometerListener.ShakeListener
 import com.yoti.mobile.android.sdk.yotidocscan.websample.SessionBottomSheet.SessionConfigurationListener
-import kotlinx.android.synthetic.main.activity_main.*
+import com.yoti.mobile.android.sdk.yotidocscan.websample.databinding.ActivityMainBinding
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -66,7 +66,6 @@ import java.util.Locale
 private const val CAPTURE_REQUEST_CODE = 1112
 private const val PERMISSIONS_REQUEST_CODE = 1114
 
-private const val TAG = "YdsWebSample"
 private const val KEY_IS_VIEW_RECREATED = "MainActivity.KEY_IS_VIEW_RECREATED"
 private const val FINISH_SESSION_URL = "https://www.yoti.com/"
 
@@ -89,15 +88,19 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
             ".jpg" to "image/jpeg"
     )
 
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         isViewRecreated = savedInstanceState?.getBoolean(KEY_IS_VIEW_RECREATED) ?: false
 
         requestPermissions()
 
-        webview.configureForYdsWeb()
+        binding.webview.configureForYdsWeb()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -125,7 +128,7 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
     }
 
     override fun onDestroy() {
-        webview.destroy()
+        binding.webview.destroy()
         super.onDestroy()
     }
 
@@ -296,8 +299,10 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
     }
 
     override fun onSessionConfigurationSuccess(sessionUrl: String) {
-        webview.visibility = VISIBLE
-        webview.loadUrl(sessionUrl)
+        with(binding) {
+            webview.visibility = VISIBLE
+            webview.loadUrl(sessionUrl)
+        }
     }
 
     override fun onSessionConfigurationDismiss() {

webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/SessionBottomSheet.kt

@@ -9,7 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.bottom_sheet.*
+import com.yoti.mobile.android.sdk.yotidocscan.websample.databinding.BottomSheetBinding
 
 private const val SESSION_PREFERENCES_ID = "SESSION_PREFERENCES_ID"
 private const val SESSION_CONFIGURATION_KEY = "SESSION_CONFIGURATION_KEY"
@@ -19,30 +19,38 @@ class SessionBottomSheet: BottomSheetDialogFragment() {
     private var sessionConfigurationListener: SessionConfigurationListener? = null
     lateinit var sharedPreferences: SharedPreferences
 
+    private var _binding: BottomSheetBinding? = null
+    private val binding: BottomSheetBinding get() = _binding!!
+
     interface SessionConfigurationListener {
         fun onSessionConfigurationSuccess(sessionUrl: String)
         fun onSessionConfigurationDismiss()
     }
 
     override fun onCreateView(
             inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? = inflater.inflate(R.layout.bottom_sheet, container, false)
+    ): View {
+        _binding = BottomSheetBinding.inflate(inflater, container, false)
+        return binding.root
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        session_url.setText(sharedPreferences.getString(SESSION_CONFIGURATION_KEY, ""))
+        with (binding) {
+            sessionUrl.setText(sharedPreferences.getString(SESSION_CONFIGURATION_KEY, ""))
 
-        start_session_button.setOnClickListener {
-            sessionConfigurationListener?.onSessionConfigurationSuccess(
-                    session_url.text.toString()
-            )
-            this.dismiss()
+            startSessionButton.setOnClickListener {
+                sessionConfigurationListener?.onSessionConfigurationSuccess(
+                        sessionUrl.text.toString()
+                )
+                dismiss()
+            }
         }
     }
 
     override fun onDismiss(dialog: DialogInterface) {
-        sharedPreferences.edit().putString(SESSION_CONFIGURATION_KEY, session_url.text.toString()).apply()
+        sharedPreferences.edit().putString(SESSION_CONFIGURATION_KEY, binding.sessionUrl.text.toString()).apply()
         sessionConfigurationListener?.onSessionConfigurationDismiss()
         super.onDismiss(dialog)
     }
@@ -53,6 +61,11 @@ class SessionBottomSheet: BottomSheetDialogFragment() {
         sessionConfigurationListener = context as? SessionConfigurationListener
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     override fun onDetach() {
         sessionConfigurationListener = null
         super.onDetach()