Use latest Intellicheck API for ID card verification. Use latest Ver-ID SDK version.

Author: jakubdolejs

app/build.gradle

@@ -3,17 +3,17 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
     defaultConfig {
         applicationId "com.appliedrec.credentials.app"
         minSdkVersion rootProject.minSdkVersion
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode rootProject.generateVersionCode()
         versionName rootProject.generateVersionName()
         buildConfigField "String", "BLINK_LICENCE_KEY", "\"" + blink5LicenceKey + "\""
         buildConfigField "String", "BLINK_SUPPORTED_DOCUMENTS_URL", "\"https://github.com/BlinkID/blinkid-android/blob/master/documentation/BlinkIDRecognizer.md\""
-        buildConfigField "String", "INTELLICHECK_URL", "\"https://dev.ver-id.com/id-check/parse-verify\""
+        buildConfigField "String", "INTELLICHECK_URL", "\"https://dev.ver-id.com/id-check/\""
         manifestPlaceholders = ["veridPassword": "8f821baf-4ae4-41cd-a175-91d7ef6a6db8"]
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -28,30 +28,31 @@ android {
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:[1.0.9,2.0.0['
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "androidx.appcompat:appcompat:$rootProject.appcompatVersion"
-    implementation "com.appliedrec.verid:rx:$rootProject.rxveridVersion"
-    implementation "com.appliedrec.verid:ui:$rootProject.veridVersion"
+    implementation "com.appliedrec.verid:ui2:$rootProject.veridVersion"
     implementation "com.appliedrec.verid:identity:$rootProject.veridIdentityVersion"
     implementation "com.appliedrec.verid:ui-elements:$rootProject.uiElementsVersion"
-    implementation 'com.google.firebase:firebase-analytics:17.4.4'
-    implementation 'com.google.firebase:firebase-crashlytics:17.1.1'
+    implementation 'com.google.firebase:firebase-analytics:18.0.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
     implementation("com.microblink:blinkid:$rootProject.blinkidVersion@aar") {
         transitive = true
     }
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.security:security-crypto:1.1.0-alpha02'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestUtil 'androidx.test:orchestrator:1.3.0'
 }

app/src/androidTest/java/com/appliedrec/credentials/app/AppTests.java

@@ -8,11 +8,19 @@
 
     <application
         android:name=".CredentialsApplication"
-        android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
+        <activity android:name=".ResultActivity" />
+        <activity android:name=".LoadingActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity android:name=".SettingsActivity" />
         <activity
             android:name=".DocumentDetailsActivity"
@@ -28,13 +36,7 @@
             android:label="@string/your_id_card" />
         <activity
             android:name=".MainActivity"
-            android:label="@string/id_capture">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:label="@string/id_capture" />
 
         <meta-data
             android:name="com.appliedrec.verid.password"

app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.appliedrec.verid.core.VerID;
+import com.appliedrec.verid.core2.VerID;
 
 public class AboutActivity extends AppCompatActivity {
 
@@ -24,7 +24,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
-        String veridVersion = "Ver-ID SDK version: "+VerID.getVersion();
+        String veridVersion = "Ver-ID SDK version: " + VerID.getVersion();
         menu.add(veridVersion);
         return true;
     }

app/src/main/java/com/appliedrec/credentials/app/AboutActivity.java

@@ -0,0 +1,60 @@
+package com.appliedrec.credentials.app;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.appliedrec.verid.core2.VerID;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.reactivex.rxjava3.disposables.Disposable;
+
+public abstract class BaseActivity extends AppCompatActivity {
+
+    ArrayList<Disposable> disposables = new ArrayList<>();
+    AtomicReference<VerID> verIDRef = new AtomicReference<>();
+    AtomicReference<ISharedData> sharedDataRef = new AtomicReference<>();
+
+    final void setVerIDProperties(VerID verID, ISharedData sharedData) {
+        verIDRef.set(verID);
+        sharedDataRef.set(sharedData);
+        new Handler(Looper.getMainLooper()).post(this::onVerIDPropertiesAvailable);
+    }
+
+    protected void onVerIDPropertiesAvailable() {
+    }
+
+    final void addDisposable(Disposable disposable) {
+        disposables.add(disposable);
+    }
+
+    final void destroy() {
+        Iterator<Disposable> disposableIterator = disposables.iterator();
+        while (disposableIterator.hasNext()) {
+            disposableIterator.next().dispose();
+            disposableIterator.remove();
+        }
+        sharedDataRef.set(null);
+        verIDRef.set(null);
+    }
+
+    final VerID getVerID() throws Exception {
+        VerID verID = verIDRef.get();
+        if (verID == null) {
+            throw new Exception("Ver-ID not available");
+        }
+        return verID;
+    }
+
+    final ISharedData getSharedData() throws Exception {
+        ISharedData sharedData = sharedDataRef.get();
+        if (sharedData == null) {
+            throw new Exception("Shared data not available");
+        }
+        return sharedData;
+    }
+}