QR Code JWT Integration

app/build.gradle

@@ -99,6 +99,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'com.jakewharton.timber:timber:4.7.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'

app/src/main/AndroidManifest.xml

@@ -1,10 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.newlogic.smartscanner">
 
     <uses-feature android:name="android.hardware.camera.any" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        tools:ignore="CoarseFineLocation" />
+
     <uses-feature
         android:name="android.hardware.camera"
         android:required="true" />
@@ -41,6 +47,11 @@
             android:exported="true"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="nosensor" />
+        <activity
+            android:name=".result.RawResultActivity"
+            android:exported="true"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="nosensor" />
         <activity
             android:name=".settings.SettingsActivity"
             android:exported="true"

app/src/main/java/org/newlogic/smartscanner/MainActivity.kt

@@ -29,22 +29,30 @@ import com.google.android.material.snackbar.Snackbar
 import org.idpass.smartscanner.api.ScannerConstants
 import org.idpass.smartscanner.api.ScannerIntent
 import org.idpass.smartscanner.lib.SmartScannerActivity
+import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_FAIL_RESULT
+import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_HEADER_RESULT
+import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_IMAGE_TYPE
+import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_JWT_CONFIG_UPDATE
+import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_RAW_RESULT
 import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_RESULT
 import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_RESULT_BYTES
+import org.idpass.smartscanner.lib.SmartScannerActivity.Companion.SCANNER_SIGNATURE_VERIFICATION
 import org.idpass.smartscanner.lib.nfc.NFCActivity
 import org.idpass.smartscanner.lib.scanner.config.*
+import org.idpass.smartscanner.lib.scanner.config.Config.Companion.OP_SCANNER
+import org.idpass.smartscanner.lib.scanner.config.Config.Companion.ORIENTATION
 import org.newlogic.smartscanner.databinding.ActivityMainBinding
 import org.newlogic.smartscanner.result.IDPassResultActivity
 import org.newlogic.smartscanner.result.ResultActivity
 import org.newlogic.smartscanner.settings.SettingsActivity
-import org.newlogic.smartscanner.settings.SettingsActivity.Companion.ORIENTATION
 
 
 class MainActivity : AppCompatActivity() {
 
     companion object {
+
         const val OP_SCANNER = 1001
-        var imageType = ImageResultType.PATH.value
+        private val imageType = ImageResultType.PATH.value
 
         private fun sampleConfig(isManualCapture: Boolean, label: String = "", orientation : String? = Orientation.PORTRAIT.value) = Config(
             branding = true,
@@ -63,7 +71,7 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         val view = binding.root
         setContentView(view)
-        preference = getSharedPreferences(SmartScannerApplication.SHARED, Context.MODE_PRIVATE)
+        preference = getSharedPreferences(Config.SHARED, Context.MODE_PRIVATE)
     }
 
     override fun onStart() {
@@ -72,6 +80,8 @@ class MainActivity : AppCompatActivity() {
         binding.itemBarcode.item.setOnClickListener { scanBarcode(BarcodeOptions.default) }
         binding.itemIdpassLite.item.setOnClickListener { scanIDPassLite() }
         binding.itemMrz.item.setOnClickListener { scanMRZ() }
+        binding.itemQr.item.setOnClickListener { scanQRCode() }
+//        binding.itemQrGzip.item.setOnClickListener { scanQRCodeGzip() }
         binding.itemNfc.item.setOnClickListener { scanNFC() }
         binding.itemPdf417.item.setOnClickListener { scanPDF417() }
         binding.itemQr.item.setOnClickListener { scanQRCode() }
@@ -122,7 +132,14 @@ class MainActivity : AppCompatActivity() {
             ScannerOptions(
                 mode = Modes.MRZ.value,
                 language = getLanguage(preference),
-                config = sampleConfig(isManualCapture = true, orientation = getOrientation(preference)),
+                config = Config(
+                    branding = true,
+                    imageResultType = imageType,
+                    label = "",
+                    isManualCapture = true,
+                    orientation = getOrientation(preference),
+                    showGuide = true
+                )
             )
         )
         startActivityForResult(intent, OP_SCANNER)
@@ -143,7 +160,8 @@ class MainActivity : AppCompatActivity() {
                         header = getString(R.string.label_scan_nfc_capture),
                         subHeader = getString(R.string.label_scan_nfc_via_mrz),
                         isManualCapture = false,
-                        branding = true
+                        branding = true,
+                        showGuide = true
                     )
                 )
             )
@@ -155,22 +173,28 @@ class MainActivity : AppCompatActivity() {
     private fun scanPDF417() {
         val intent = Intent(this, SmartScannerActivity::class.java)
         intent.putExtra(
-                SmartScannerActivity.SCANNER_OPTIONS,
-                ScannerOptions(
-                    mode = Modes.PDF_417.value,
-                    language = getLanguage(preference),
-                    scannerSize = ScannerSize.SMALL.value,
-                    config = sampleConfig(false)
-                )
+            SmartScannerActivity.SCANNER_OPTIONS,
+            ScannerOptions(
+                mode = Modes.PDF_417.value,
+                language = getLanguage(preference),
+                scannerSize = ScannerSize.SMALL.value,
+                config = sampleConfig(false)
+            )
         )
         startActivityForResult(intent, OP_SCANNER)
     }
 
     private fun scanQRCode()  {
-        val intent = ScannerIntent.intentQRCode(
-            isGzipped = true,
-            isJson = true,
-            jsonPath = "" // ex: "$.members[1].lastName"
+        val intent = Intent(this, SmartScannerActivity::class.java)
+        intent.putExtra(
+            SmartScannerActivity.SCANNER_OPTIONS,
+            ScannerOptions(
+                mode = Modes.QRCODE.value,
+                language = preference?.getString(Language.NAME, Language.EN),
+                scannerSize = ScannerSize.LARGE.value,
+                qrCodeOptions = QRcodeOptions(isJson = true),
+                config = sampleConfig(false)
+            )
         )
         startActivityForResult(intent, OP_SCANNER)
     }
@@ -185,37 +209,61 @@ class MainActivity : AppCompatActivity() {
         if (requestCode == OP_SCANNER) {
             Log.d(SmartScannerActivity.TAG, "Scanner resultCode $resultCode")
             if (resultCode == RESULT_OK) {
-                // Get Result from Bundle Intent Call Out
-                intent?.getBundleExtra(ScannerConstants.RESULT)?.let { bundleResult ->
-                    Log.d(SmartScannerActivity.TAG, "Scanner result bundle: $bundleResult")
-                    if (bundleResult.getString(ScannerConstants.MODE) == Modes.IDPASS_LITE.value) {
+                val bundle = intent?.getBundleExtra(ScannerConstants.RESULT)
+                val mIntent: Intent;
+
+                if (bundle != null) {
+                    // Get Result from Bundle Intent Call Out
+                    if (bundle.getString(ScannerConstants.MODE) == Modes.IDPASS_LITE.value) {
                         // Go to ID PASS Lite Results Screen via bundle
-                        val myIntent = Intent(this, IDPassResultActivity::class.java)
-                        myIntent.putExtra(IDPassResultActivity.BUNDLE_RESULT, bundleResult)
-                        startActivity(myIntent)
+                        mIntent = Intent(this, IDPassResultActivity::class.java)
+                        mIntent.putExtra(IDPassResultActivity.BUNDLE_RESULT, bundle)
                     } else {
-                        // Go to Barcode/MRZ Results Screen via bundle
-                        val resultIntent = Intent(this, ResultActivity::class.java)
-                        resultIntent.putExtra(ResultActivity.BUNDLE_RESULT, bundleResult)
-                        startActivity(resultIntent)
+                        // Go to Results Screen via bundle
+                        mIntent = Intent(this, ResultActivity::class.java)
+                        mIntent.putExtra(ResultActivity.BUNDLE_RESULT, bundle)
                     }
-                } ?: run {
-                    // Get Result from JSON String
-                    val result = intent?.getStringExtra(SCANNER_RESULT)
-                    Log.d(SmartScannerActivity.TAG, "Scanner result string: $result")
-                    if (!result.isNullOrEmpty()) {
-                        // Go to Barcode/MRZ Results Screen
-                        val resultIntent = Intent(this, ResultActivity::class.java)
-                        resultIntent.putExtra(ResultActivity.RESULT, result)
-                        startActivity(resultIntent)
-                    } else {
+                } else {
+                    // Get Result from Intent extras
+                    if (intent?.getStringExtra(ScannerConstants.MODE) == Modes.IDPASS_LITE.value) {
                         // Go to ID PASS Lite Results Screen
-                        val resultBytes = intent?.getByteArrayExtra(SCANNER_RESULT_BYTES)
-                        val myIntent = Intent(this, IDPassResultActivity::class.java)
-                        myIntent.putExtra(IDPassResultActivity.RESULT, resultBytes)
-                        startActivity(myIntent)
+                        val resultBytes = intent.getByteArrayExtra(SCANNER_RESULT_BYTES)
+                        mIntent = Intent(this, IDPassResultActivity::class.java)
+                        mIntent.putExtra(IDPassResultActivity.RESULT, resultBytes)
+                    } else {
+
+                        // Check if it should go to the settings instead
+                        val isConfigUpdated = intent?.getBooleanExtra(SCANNER_JWT_CONFIG_UPDATE, false)
+
+                        // should go to settings
+                        if (isConfigUpdated == true) {
+                            val sIntent = Intent(this, SettingsActivity::class.java)
+                            sIntent.putExtra(SettingsActivity.CONFIG_UPDATED, true)
+                            startActivity(sIntent)
+                            return
+                        }
+
+                        // Go to Results Screen
+                        val result = intent?.getStringExtra(SCANNER_RESULT)
+                        val verified = intent?.getBooleanExtra(SCANNER_SIGNATURE_VERIFICATION, false)
+                        val rawResult = intent?.getStringExtra(SCANNER_RAW_RESULT)
+                        val failResult = intent?.getStringExtra(SCANNER_FAIL_RESULT)
+                        val headerResult = intent?.getStringExtra(SCANNER_HEADER_RESULT)
+
+                        mIntent = Intent(this, ResultActivity::class.java)
+                        mIntent.putExtra(ResultActivity.SIGNATURE_VERIFIED, verified)
+                        mIntent.putExtra(ResultActivity.IMAGE_TYPE, intent?.getStringExtra(SCANNER_IMAGE_TYPE))
+                        mIntent.putExtra(ResultActivity.RESULT, result)
+                        mIntent.putExtra(ResultActivity.FAIL_RESULT, failResult)
+                        mIntent.putExtra(ResultActivity.RAW_RESULT, rawResult)
+                        mIntent.putExtra(ResultActivity.HEADER_RESULT, headerResult)
+
                     }
                 }
+
+
+                mIntent.putExtra(ScannerConstants.MODE, intent?.getStringExtra(ScannerConstants.MODE))
+                startActivity(mIntent)
             }
         }
     }

app/src/main/java/org/newlogic/smartscanner/SmartScannerApplication.kt

@@ -50,8 +50,4 @@ class SmartScannerApplication : MultiDexApplication() {
             }
         }
     }
-
-    companion object {
-        const val SHARED = "SHARED"
-    }
 }

app/src/main/java/org/newlogic/smartscanner/adapters/RecyclerResultAdapter.kt

@@ -0,0 +1,35 @@
+package org.newlogic.smartscanner.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import org.newlogic.smartscanner.R
+
+class RecyclerResultAdapter (private var results: HashMap<String, String>): RecyclerView.Adapter<RecyclerResultAdapter.ViewHolder>() {
+
+    inner class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+        val itemLabel: TextView = itemView.findViewById(R.id.tv_label)
+        val itemValue: TextView = itemView.findViewById(R.id.tv_value)
+
+        // no click listener here
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val v = LayoutInflater.from(parent.context).inflate(R.layout.recycler_result_item, parent, false)
+        return ViewHolder(v)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+
+        val keyByIndex = results.keys.elementAt(position)
+        val valueByKey = results.getValue(keyByIndex)
+        holder.itemLabel.text = keyByIndex
+        holder.itemValue.text = valueByKey
+    }
+
+    override fun getItemCount(): Int {
+        return results.size
+    }
+}

app/src/main/java/org/newlogic/smartscanner/result/IDPassResultActivity.kt

@@ -36,10 +36,10 @@ import org.idpass.lite.exceptions.InvalidKeyException
 import org.idpass.smartscanner.api.ScannerConstants
 import org.idpass.smartscanner.lib.SmartScannerActivity
 import org.idpass.smartscanner.lib.idpasslite.IDPassManager
-import org.idpass.smartscanner.lib.platform.extension.empty
-import org.idpass.smartscanner.lib.platform.extension.hideKeyboard
-import org.idpass.smartscanner.lib.platform.utils.DateUtils.formatDate
-import org.idpass.smartscanner.lib.platform.utils.DateUtils.isValidDate
+import org.idpass.smartscanner.lib.utils.DateUtils.formatDate
+import org.idpass.smartscanner.lib.utils.DateUtils.isValidDate
+import org.idpass.smartscanner.lib.utils.extension.empty
+import org.idpass.smartscanner.lib.utils.extension.hideKeyboard
 import org.newlogic.smartscanner.R
 
 class IDPassResultActivity : AppCompatActivity(), View.OnClickListener {