From a1d8465e2d988e83d56b1979ddbe5fabd85527de Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Tue, 17 Nov 2020 11:57:36 +0100
Subject: [PATCH] Fix appconfig display for testers (DEV) #1624
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
---
Corona-Warn-App/proguard-rules.pro | 7 +++----
.../test/appconfig/ui/AppConfigTestFragment.kt | 9 +++------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Corona-Warn-App/proguard-rules.pro b/Corona-Warn-App/proguard-rules.pro
index 13dfa13cd..a494dc86a 100644
--- a/Corona-Warn-App/proguard-rules.pro
+++ b/Corona-Warn-App/proguard-rules.pro
@@ -72,9 +72,6 @@
-dontwarn sun.misc.**
#-keep class com.google.gson.stream.** { *; }
-# Application classes that will be serialized/deserialized over Gson
--keep class com.google.gson.examples.android.model.** { <fields>; }
-
# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
-keep class * extends com.google.gson.TypeAdapter
@@ -87,4 +84,6 @@
@com.google.gson.annotations.SerializedName <fields>;
}
-##---------------End: proguard configuration for Gson ----------
\ No newline at end of file
+##---------------End: proguard configuration for Gson ----------
+
+-keep class de.rki.coronawarnapp.server.protocols.internal.** { *; }
\ No newline at end of file
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
index 742411f39..09567384f 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
@@ -32,12 +32,9 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn
super.onViewCreated(view, savedInstanceState)
vm.currentConfig.observe2(this) { data ->
- binding.currentConfiguration.text =
- data?.rawConfig?.toString() ?: "No config available."
- binding.lastUpdate.text = data?.updatedAt?.let { timeFormatter.print(it) } ?: "n/a"
- binding.timeOffset.text = data?.let {
- "${it.localOffset.millis}ms (configType=${it.configType})"
- } ?: "n/a"
+ binding.currentConfiguration.text = data.rawConfig.toString()
+ binding.lastUpdate.text = timeFormatter.print(data.updatedAt)
+ binding.timeOffset.text = "${data.localOffset.millis}ms (configType=${data.configType})"
}
vm.errorEvent.observe2(this) {
--
GitLab