Merge pull request #35 from FreshworksStudio/main

Scanning Yukon proof of vaccination certificates is now supported
Updated validation rules for scanning vaccine certificates

Author: pinakinkansara

.gitignore

@@ -13,6 +13,7 @@
 /.idea/misc.xml
 /.idea/compiler.xml
 /.idea/deploymentTargetDropDown.xml
+/.idea/jarRepositories.xml
 .DS_Store
 /build
 /captures

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "ca.bc.gov.vaxcheck"
         minSdk 27
         targetSdk 31
-        versionCode 12
-        versionName "1.0.1"
+        versionCode 18
+        versionName "1.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,13 +30,9 @@ android {
     flavorDimensions "version"
     productFlavors {
 
-        demo{
+        dev{
             dimension "version"
-            versionNameSuffix "-demo"
-        }
-        stage {
-            dimension "version"
-            versionNameSuffix "-stage"
+            versionNameSuffix "-dev"
         }
 
         prod {
@@ -63,7 +59,7 @@ android {
 }
 
 dependencies {
-
+//    implementation fileTree(dir: "src/**/libs", include: ["*.jar", "*.aar"])
     implementation "androidx.core:core-ktx:$versions.core_ktx"
 
     implementation "androidx.appcompat:appcompat:$versions.appcompat"
@@ -90,6 +86,10 @@ dependencies {
 
     //Dagger Hilt
     implementation "com.google.dagger:hilt-android:$versions.hilt"
+//    implementation project(path: ':shcDecoder')
+    
+    devImplementation "ca.bc.gov:shcdecoder-dev:$versions.shcdecoder"
+    prodImplementation "ca.bc.gov:shcdecoder:$versions.shcdecoder"
 
     kapt "com.google.dagger:hilt-compiler:$versions.hilt"
 
@@ -109,20 +109,6 @@ dependencies {
 
     implementation "androidx.camera:camera-extensions:$versions.camerax_extensions"
 
-    //GSOn
-    implementation "com.google.code.gson:gson:$versions.gson"
-
-    //JWT library
-    api "io.jsonwebtoken:jjwt-api:$versions.jjwt"
-    implementation "io.jsonwebtoken:jjwt-impl:$versions.jjwt"
-    implementation("io.jsonwebtoken:jjwt-orgjson:$versions.jjwt") {
-        exclude group: 'org.json', module: 'json' //provided by Android natively
-    }
-
-    implementation "org.bouncycastle:bcprov-jdk15on:$versions.bouncycastle"
-
-    // https://stackoverflow.com/questions/29402155/android-unit-test-not-mocked
-    testImplementation 'org.json:json:20210307'
 
     testImplementation "junit:junit:$versions.junit"
 

app/proguard-rules.pro

@@ -21,15 +21,4 @@
 #-renamesourcefileattribute SourceFile
 
 #KEEP MODEL
--keep class ca.bc.gov.vaxcheck.model.** { *; }
-
-#JJWKT
--keepattributes InnerClasses
-
--keep class io.jsonwebtoken.** { *; }
--keepnames class io.jsonwebtoken.* { *; }
--keepnames interface io.jsonwebtoken.* { *; }
-
--keep class org.bouncycastle.** { *; }
--keepnames class org.bouncycastle.** { *; }
--dontwarn org.bouncycastle.**
+-keep class ca.bc.gov.vaxcheck.model.** { *; }

app/src/androidTest/java/ca/bc/gov/vaxcheck/ExampleInstrumentedTest.kt

@@ -1,12 +1,9 @@
 package ca.bc.gov.vaxcheck
 
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
 import dagger.hilt.android.AndroidEntryPoint
 
-
 /**
  * [MainActivity]
  *

app/src/main/java/ca/bc/gov/vaxcheck/MainActivity.kt

@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
-import ca.bc.gov.vaxcheck.ui.onboarding.OnBoardingFragment
 
 /**
  * [SplashActivity]
@@ -23,4 +22,4 @@ class SplashActivity : AppCompatActivity() {
             finish()
         }, 3000)
     }
-}
+}

app/src/main/java/ca/bc/gov/vaxcheck/SplashActivity.kt

@@ -41,7 +41,6 @@ class BarcodeAnalyzer(private val listener: ScanningResultListener) : ImageAnaly
                         }
                     }
                     isScanning = false
-
                 }
                 .addOnFailureListener {
                     listener.onFailure()

app/src/main/java/ca/bc/gov/vaxcheck/barcodeanalyzer/BarcodeAnalyzer.kt

@@ -5,10 +5,9 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.preferencesDataStore
 import ca.bc.gov.vaxcheck.BuildConfig
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import javax.inject.Inject
-
 
 /**
  * [DataStoreRepo]

app/src/main/java/ca/bc/gov/vaxcheck/data/local/DataStoreRepo.kt

@@ -9,7 +9,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
-
 /**
  * [DataStoreModule]
  *

app/src/main/java/ca/bc/gov/vaxcheck/di/DataStoreModule.kt

@@ -1,10 +1,13 @@
 package ca.bc.gov.vaxcheck.di
 
-import ca.bc.gov.vaxcheck.utils.SHCDecoder
+import android.content.Context
+import ca.bc.gov.shcdecoder.BcCardVerifier
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 
 /**
  * [DecoderModule]
@@ -16,11 +19,7 @@ import dagger.hilt.components.SingletonComponent
 @InstallIn(SingletonComponent::class)
 class DecoderModule {
 
-    /**
-     * This method will provide dependency resolution for shcDecoder.
-     *
-     * @return SHCDecoder singleton instance
-     */
     @Provides
-    fun providesSHCDecoder() = SHCDecoder()
-}
+    @Singleton
+    fun provideBCVerifier(@ApplicationContext context: Context) = BcCardVerifier(context)
+}