diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
index 1de6e298ada80c107b9da7fd9af3ff455a81f030..c03b84f39023d1999f7d0e38b93fa25b1e6d0d10 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
@@ -16,7 +16,6 @@ import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.RecyclerView
import androidx.viewpager2.widget.ViewPager2
import com.google.android.gms.nearby.exposurenotification.ExposureNotificationClient
-import com.google.android.gms.nearby.exposurenotification.ExposureWindow
import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
import com.google.android.material.snackbar.Snackbar
import com.google.gson.Gson
@@ -120,7 +119,6 @@ class TestForAPIFragment : Fragment(R.layout.fragment_test_for_a_p_i),
binding.apply {
buttonApiTestStart.setOnClickListener { start() }
buttonApiGetExposureKeys.setOnClickListener { getExposureKeys() }
- buttonApiGetCheckExposure.setOnClickListener { checkExposure() }
buttonApiScanQrCode.setOnClickListener {
IntentIntegrator.forSupportFragment(this@TestForAPIFragment)
@@ -198,12 +196,6 @@ class TestForAPIFragment : Fragment(R.layout.fragment_test_for_a_p_i),
}
}
- override fun onResume() {
- super.onResume()
-
- updateExposureSummaryDisplay(null)
- }
-
private val prettyKey = { key: AppleLegacyKeyExchange.Key ->
StringBuilder()
.append("\nKey data: ${key.keyData}")
@@ -309,51 +301,6 @@ class TestForAPIFragment : Fragment(R.layout.fragment_test_for_a_p_i),
}
}
- private fun checkExposure() {
- Timber.d("Check Exposure")
-
- lifecycleScope.launch {
- try {
- val exposureSummary = enfClient.exposureWindows()
- updateExposureSummaryDisplay(exposureSummary)
- showToast("Updated Exposure Summary")
- Timber.d("Received exposure from QR Code")
- Timber.i(exposureSummary.toString())
- } catch (e: Exception) {
- e.report(ExceptionCategory.EXPOSURENOTIFICATION)
- }
- }
- }
-
- private fun updateExposureSummaryDisplay(windows: List<ExposureWindow>?) {
-
- // FIXME
-// binding.labelExposureSummaryMatchedKeyCount.text = getString(
-// R.string.test_api_body_matchedKeyCount,
-// (exposureSummary?.matchedKeyCount ?: "-").toString()
-// )
-//
-// binding.labelExposureSummaryDaysSinceLastExposure.text = getString(
-// R.string.test_api_body_daysSinceLastExposure,
-// (exposureSummary?.daysSinceLastExposure ?: "-").toString()
-// )
-//
-// binding.labelExposureSummaryMaximumRiskScore.text = getString(
-// R.string.test_api_body_maximumRiskScore,
-// (exposureSummary?.maximumRiskScore ?: "-").toString()
-// )
-//
-// binding.labelExposureSummarySummationRiskScore.text = getString(
-// R.string.test_api_body_summation_risk,
-// (exposureSummary?.summationRiskScore ?: "-").toString()
-// )
-//
-// binding.labelExposureSummaryAttenuation.text = getString(
-// R.string.test_api_body_attenuation,
-// (exposureSummary?.attenuationDurationsInMinutes?.joinToString() ?: "-").toString()
-// )
- }
-
private fun updateKeysDisplay() {
val myKeys =
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
index a4eb49227c15f443d2dde6b13eb76d3affca190c..30b10c80b5acd13b4e1e7963521ba2fe44500099 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
@@ -61,36 +61,6 @@
android:layout_marginBottom="@dimen/spacing_tiny"
android:text="@string/test_api_exposure_summary_headline" />
- <TextView
- android:id="@+id/label_exposure_summary_matchedKeyCount"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/test_api_body_matchedKeyCount" />
-
- <TextView
- android:id="@+id/label_exposure_summary_daysSinceLastExposure"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/test_api_body_daysSinceLastExposure" />
-
- <TextView
- android:id="@+id/label_exposure_summary_maximumRiskScore"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/test_api_body_maximumRiskScore" />
-
- <TextView
- android:id="@+id/label_exposure_summary_summationRiskScore"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/test_api_body_summation_risk" />
-
- <TextView
- android:id="@+id/label_exposure_summary_attenuation"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/test_api_body_attenuation" />
-
<Button
android:id="@+id/button_api_scan_qr_code"
style="@style/buttonPrimary"
@@ -106,14 +76,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
android:text="@string/test_api_button_enter_other_keys" />
-
- <Button
- android:id="@+id/button_api_get_check_exposure"
- style="@style/buttonPrimary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_tiny"
- android:text="@string/test_api_button_check_exposure" />
</LinearLayout>
<LinearLayout
diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml
index 2d1890d30f5f492d038d8df7d82d931021860cdf..03b2b1f7a0f2b3c5313198d83369a2a978d274c4 100644
--- a/Corona-Warn-App/src/main/res/values-bg/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml
@@ -1257,17 +1257,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 102761a193ba2433ac9329ff7e256f4cf7fdd466..f8eaa6a2e06e2b1893ce39c6db4ba5b014fb3e53 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1259,17 +1259,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml
index 1671da109a0a5ad15f715b8594585729680b28d0..6b9d4ca42f8c7a9b242d2e1f1862b7caa903e1df 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -1257,17 +1257,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml
index 657e14803b0f9b1ef31c6b20af13af4fcc91f7ff..e6583c9af191c2f552c6c04953312988958f0e7f 100644
--- a/Corona-Warn-App/src/main/res/values-pl/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml
@@ -1257,17 +1257,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml
index 1f52872f8b5de27c4bd6b3a0b8323732e798ef12..3bcca1384b7d4d00442d9525c768e0273cbdac85 100644
--- a/Corona-Warn-App/src/main/res/values-ro/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml
@@ -1257,17 +1257,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml
index 2a391bcd3bd1f95dc11bdd464ec5dfc5d2719de3..2af4f639b65779e8db88d69aec94612aa733ebb8 100644
--- a/Corona-Warn-App/src/main/res/values-tr/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml
@@ -1257,17 +1257,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index d120c2c1a4bc91089abbbf63710b9e9091829397..b76608adbad8e9fdfeec178b7849432f9c1ab914 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1263,17 +1263,7 @@
<!-- NOTR -->
<string name="test_api_button_check_exposure">"Check Exposure Summary"</string>
<!-- NOTR -->
- <string name="test_api_exposure_summary_headline">"Exposure summary"</string>
- <!-- NOTR -->
- <string name="test_api_body_daysSinceLastExposure">"Days since last exposure: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_attenuation">"Attenuation Durations in Minutes: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_summation_risk">"Summation Risk Score: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_matchedKeyCount">"Matched key count: %1$s"</string>
- <!-- NOTR -->
- <string name="test_api_body_maximumRiskScore">"Maximum risk score %1$s"</string>
+ <string name="test_api_exposure_summary_headline">"Exposure Windows"</string>
<!-- NOTR -->
<string name="test_api_body_my_keys">"My keys (count: %1$d)"</string>
<!-- NOTR -->