Merge remote-tracking branch 'origin/feature/7446-local-incidence-car…

…d' into feature/7446-local-incidence-card
corona-warn-app · Jul 11, 2021 · bea26f2 · bea26f2
2 parents ccf5e9f + 0b7023a
commit bea26f2
Show file tree

Hide file tree

Showing 115 changed files with 2,609 additions and 1,941 deletions.
diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
@@ -165,6 +165,8 @@ android {
  }
 
  compileOptions {
+ // Required for rdgca.verifier.app:dgc-certlogic-android-light API 26 Time API
+ coreLibraryDesugaringEnabled true
  sourceCompatibility JavaVersion.VERSION_1_8
  targetCompatibility JavaVersion.VERSION_1_8
  }
@@ -252,6 +254,7 @@ android {
  }
  test {
  java.srcDirs += "$projectDir/src/testShared/java"
+ resources.srcDirs += "src/main/assets"
  }
  androidTest {
  java.srcDirs += "$projectDir/src/testShared/java"
@@ -303,19 +306,25 @@ configurations.all {
  }
 }
 
+repositories {
+ maven { url "../local-maven-repo" }
+}
+
 dependencies {
- // TODO reevaluate better dependency inclusion
- releaseImplementation files('libs/engine-release-bc467afcd8375ff5f579f9cac5bcfba74b55fcd7.aar')
- debugImplementation files('libs/engine-debug-bc467afcd8375ff5f579f9cac5bcfba74b55fcd7.aar')
- implementation("com.fasterxml.jackson.core:jackson-databind:2.12.3")
+ // Comes from `local-maven-repo`
+ // See https://github.com/corona-warn-app/dgc-certlogic-android
+ implementation ('dgca.verifier.app:dgc-certlogic-android-light:+')
+
+ // Required for rdgca.verifier.app:dgc-certlogic-android-light API 26 Time API
+ coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
  // KOTLIN
  def coroutineVersion = "1.5.0"
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion"
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion"
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutineVersion"
  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion"
- testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.5.0"
+ testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
  androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVersion"
 
  // ANDROID STANDARD
@@ -440,9 +449,10 @@ dependencies {
  implementation 'com.google.guava:guava:30.0-android'
  implementation 'joda-time:joda-time:2.10.6'
 
+ implementation 'com.networknt:json-schema-validator:1.0.56'
+
  // SECURITY
  implementation "androidx.security:security-crypto:1.0.0-rc03"
- implementation 'net.zetetic:android-database-sqlcipher:4.4.0'
  implementation 'org.conscrypt:conscrypt-android:2.5.1'
 
  // LOGGING

diff --git a/Corona-Warn-App/libs/engine-debug-bc467afcd8375ff5f579f9cac5bcfba74b55fcd7.aar b/Corona-Warn-App/libs/engine-debug-bc467afcd8375ff5f579f9cac5bcfba74b55fcd7.aar
diff --git a/Corona-Warn-App/libs/engine-release-bc467afcd8375ff5f579f9cac5bcfba74b55fcd7.aar b/Corona-Warn-App/libs/engine-release-bc467afcd8375ff5f579f9cac5bcfba74b55fcd7.aar
diff --git a/Corona-Warn-App/proguard-rules.pro b/Corona-Warn-App/proguard-rules.pro
@@ -17,8 +17,6 @@
 }
 
 -keep class * extends com.google.crypto.tink.shaded.protobuf.GeneratedMessageLite { *; }
--keep class net.sqlcipher.** { *; }
--dontwarn net.sqlcipher.**
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.

diff --git a/.../java/de/rki/coronawarnapp/covidcertificate/test/ui/TestCertificateDetailsFragmentTest.kt b/.../java/de/rki/coronawarnapp/covidcertificate/test/ui/TestCertificateDetailsFragmentTest.kt
@@ -14,6 +14,7 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.covidcertificate.common.certificate.CertificatePersonIdentifier
+import de.rki.coronawarnapp.covidcertificate.common.certificate.DccData
 import de.rki.coronawarnapp.covidcertificate.common.certificate.TestDccV1
 import de.rki.coronawarnapp.covidcertificate.common.qrcode.QrCodeString
 import de.rki.coronawarnapp.covidcertificate.common.repository.TestCertificateContainerId
@@ -140,6 +141,8 @@ class TestCertificateDetailsFragmentTest : BaseUITest() {
  get() = "Germany"
  override val certificateId: String
  get() = "05930482748454836478695764787840"
+ override val dccData: DccData<*>
+ get() = mockk()
  }
  )
  }