Skip to content
Snippets Groups Projects
Unverified Commit a1d8465e authored by Matthias Urhahn's avatar Matthias Urhahn Committed by GitHub
Browse files

Fix appconfig display for testers (DEV) #1624

parent ec910ab5
No related branches found
No related tags found
No related merge requests found
...@@ -72,9 +72,6 @@ ...@@ -72,9 +72,6 @@
-dontwarn sun.misc.** -dontwarn sun.misc.**
#-keep class com.google.gson.stream.** { *; } #-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, # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
-keep class * extends com.google.gson.TypeAdapter -keep class * extends com.google.gson.TypeAdapter
...@@ -87,4 +84,6 @@ ...@@ -87,4 +84,6 @@
@com.google.gson.annotations.SerializedName <fields>; @com.google.gson.annotations.SerializedName <fields>;
} }
##---------------End: proguard configuration for Gson ---------- ##---------------End: proguard configuration for Gson ----------
\ No newline at end of file
-keep class de.rki.coronawarnapp.server.protocols.internal.** { *; }
\ No newline at end of file
...@@ -32,12 +32,9 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn ...@@ -32,12 +32,9 @@ class AppConfigTestFragment : Fragment(R.layout.fragment_test_appconfig), AutoIn
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
vm.currentConfig.observe2(this) { data -> vm.currentConfig.observe2(this) { data ->
binding.currentConfiguration.text = binding.currentConfiguration.text = data.rawConfig.toString()
data?.rawConfig?.toString() ?: "No config available." binding.lastUpdate.text = timeFormatter.print(data.updatedAt)
binding.lastUpdate.text = data?.updatedAt?.let { timeFormatter.print(it) } ?: "n/a" binding.timeOffset.text = "${data.localOffset.millis}ms (configType=${data.configType})"
binding.timeOffset.text = data?.let {
"${it.localOffset.millis}ms (configType=${it.configType})"
} ?: "n/a"
} }
vm.errorEvent.observe2(this) { vm.errorEvent.observe2(this) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment