Release-Candidate 1.11.0-RC5

gematik · May 22, 2023 · af2ac5f · af2ac5f
1 parent 9b3f588
commit af2ac5f
Show file tree

Hide file tree

Showing 93 changed files with 2,974 additions and 1,202 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+# Release 1.11.0-RC5
+- Direct redemption of prescription without TI
+- Bugfixes
+
 # Release 1.10.0
 - Began implementation for support of private insurances
 - Bugfixes

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -60,13 +60,12 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
     }
 

diff --git a/android/src/debug/java/de/gematik/ti/erp/app/debug/ui/DebugSettingsViewModel.kt b/android/src/debug/java/de/gematik/ti/erp/app/debug/ui/DebugSettingsViewModel.kt
@@ -64,6 +64,7 @@ import java.security.KeyFactory
 import java.security.Signature
 import java.time.Instant
 import java.time.temporal.ChronoUnit
+import java.util.*
 
 private val HealthCardCert = BuildKonfig.DEFAULT_VIRTUAL_HEALTH_CARD_CERTIFICATE
 private val HealthCardCertPrivateKey = BuildKonfig.DEFAULT_VIRTUAL_HEALTH_CARD_PRIVATE_KEY
@@ -346,11 +347,12 @@ class DebugSettingsViewModel(
             }
         } while (obj != null)
 
-        pharmacyDirectRedeemUseCase.redeemPrescription(
+        pharmacyDirectRedeemUseCase.redeemPrescriptionDirectly(
             url = url,
             message = message,
             telematikId = "",
-            recipientCertificates = certificates
+            recipientCertificates = certificates,
+            transactionId = UUID.randomUUID().toString()
         ).getOrThrow()
     }