From 01a52e809b06607d3b52255a0045e29c9243649e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20M=C3=B6ller?= <jakob.moeller@sap.com>
Date: Fri, 12 Jun 2020 14:00:39 +0200
Subject: [PATCH] Fix/no error on network connectivity error (#414)
* No Error Dialog on Network Connectivity missing
Signed-off-by: d067928 <jakob.moeller@sap.com>
* fixed unit test and changed comments
Co-authored-by: Hee Tatt Ooi <hee.tatt.ooi@sap.com>
Co-authored-by: Philipp Woessner <philipp.woessner@sap.com>
---
.../coronawarnapp/transaction/RiskLevelTransaction.kt | 10 +---------
.../transaction/RiskLevelTransactionTest.kt | 3 +--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt
index e0043fa81..01adeab17 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RiskLevelTransaction.kt
@@ -4,10 +4,7 @@ import androidx.core.app.NotificationCompat
import com.google.android.gms.nearby.exposurenotification.ExposureSummary
import de.rki.coronawarnapp.CoronaWarnApplication
import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.exception.ExceptionCategory
-import de.rki.coronawarnapp.exception.NoNetworkException
import de.rki.coronawarnapp.exception.RiskLevelCalculationException
-import de.rki.coronawarnapp.exception.reporting.report
import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
import de.rki.coronawarnapp.notification.NotificationHelper
import de.rki.coronawarnapp.risk.RiskLevel
@@ -314,7 +311,7 @@ object RiskLevelTransaction : Transaction() {
/**
* Executes the [CHECK_APP_CONNECTIVITY] Transaction State
* If there is no connectivity the transaction will set the last calculated
- * risk level, report a [NoNetworkException] and closes the transaction
+ * risk level and closes the transaction
*
* @return
*/
@@ -325,11 +322,6 @@ object RiskLevelTransaction : Transaction() {
if (!isNetworkEnabled) {
RiskLevelRepository.setLastCalculatedRiskLevelAsCurrent()
- NoNetworkException(
- IllegalStateException("Network is required to retrieve the Application Configuration")
- ).report(
- ExceptionCategory.CONNECTIVITY
- )
return@executeState false
}
return@executeState true
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
index 9ecb02b8e..b22992e9f 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
@@ -3,7 +3,6 @@ package de.rki.coronawarnapp.transaction
import android.content.Context
import com.google.android.gms.nearby.exposurenotification.ExposureSummary
import de.rki.coronawarnapp.CoronaWarnApplication
-import de.rki.coronawarnapp.exception.TransactionException
import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
import de.rki.coronawarnapp.risk.RiskLevel
import de.rki.coronawarnapp.risk.RiskLevel.INCREASED_RISK
@@ -363,7 +362,7 @@ class RiskLevelTransactionTest {
}
/** Test case if app is not connected */
- @Test(expected = TransactionException::class)
+ @Test
fun checkAppConnectivity() {
val testRiskLevel = INCREASED_RISK
--
GitLab