diff --git a/Corona-Warn-App/proguard-rules.pro b/Corona-Warn-App/proguard-rules.pro index 13dfa13cd055802fd1285f1182d31af5f22bf11a..a494dc86a67e75431934ce0fd0adeeab58b9ddee 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 742411f39edaa87b0a911267cb3b4d527326c194..09567384fd47b06010a3379f788b0f8b5f2a6f78 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) {