Updated fields adding to external parameter and to rules (eu-digital-…

…green-certificates#118) * Updated fields adding to external parameter and to rules * Updated fetching of issuing country
ralexey · Jun 29, 2021 · 90e1ecb · 90e1ecb
1 parent a7e4fd3
commit 90e1ecb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/src/main/java/dgca/verifier/app/android/di/EngineModule.kt b/app/src/main/java/dgca/verifier/app/android/di/EngineModule.kt
@@ -73,7 +73,8 @@ object EngineModule {
     @Singleton
     @Provides
     fun provideRulesDb(@ApplicationContext context: Context): EngineDatabase =
-        Room.databaseBuilder(context, EngineDatabase::class.java, "engine-db").build()
+        Room.databaseBuilder(context, EngineDatabase::class.java, "engine-db")
+            .fallbackToDestructiveMigration().build()
 
     @Singleton
     @Provides

diff --git a/app/src/main/java/dgca/verifier/app/android/di/LocalDataSourceModule.kt b/app/src/main/java/dgca/verifier/app/android/di/LocalDataSourceModule.kt
@@ -39,5 +39,6 @@ object LocalDataSourceModule {
     @Singleton
     @Provides
     fun provideDb(@ApplicationContext context: Context): AppDatabase =
-        Room.databaseBuilder(context, AppDatabase::class.java, "key-db").build()
+        Room.databaseBuilder(context, AppDatabase::class.java, "key-db")
+            .fallbackToDestructiveMigration().build()
 }
diff --git a/app/src/main/java/dgca/verifier/app/android/verification/VerificationViewModel.kt b/app/src/main/java/dgca/verifier/app/android/verification/VerificationViewModel.kt
@@ -128,7 +128,8 @@ class VerificationViewModel @Inject constructor(
                 greenCertificateData = cborService.decodeData(coseData.cbor, verificationResult)
                 validateCertData(greenCertificateData?.greenCertificate, verificationResult)
 
-                val certificates = verifierRepository.getCertificatesBy(kid.toBase64())
+                val base64EncodedKid = kid.toBase64()
+                val certificates = verifierRepository.getCertificatesBy(base64EncodedKid)
                 if (certificates.isEmpty()) {
                     Timber.d("Verification failed: failed to load certificate")
                     return@withContext
@@ -151,8 +152,9 @@ class VerificationViewModel @Inject constructor(
                                 ), Type.ACCEPTANCE, this.greenCertificate.getType()
                             )
                         )
-                        val issuingCountry = this.greenCertificate.getIssuingCountry()
-                        if (issuingCountry.isNotBlank()) {
+                        val issuingCountry: String? =
+                            if (this.issuingCountry?.isNotBlank() == true) this.issuingCountry else this.greenCertificate.getIssuingCountry()
+                        if (issuingCountry?.isNotBlank() == true) {
                             rules.addAll(
                                 rulesRepository.getRulesBy(
                                     issuingCountry, ZonedDateTime.now().withZoneSameInstant(
@@ -171,6 +173,7 @@ class VerificationViewModel @Inject constructor(
                         }
 
                         val externalParameter = ExternalParameter(
+                            base64EncodedKid,
                             ZonedDateTime.now(ZoneId.of(ZoneOffset.UTC.id)),
                             valueSetsMap,
                             countryIsoCode,