diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/server/DownloadInfo.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/server/DownloadInfo.kt
index 96f0047daf54c66dc5e6637ac07d2247eb54cf49..fb1dcbeebc0c6e027f36f3f2189a820e75ca2943 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/server/DownloadInfo.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/server/DownloadInfo.kt
@@ -10,8 +10,9 @@ data class DownloadInfo(
     val serverMD5 by lazy { headers.getPayloadChecksumMD5() }
 
     private fun Headers.getPayloadChecksumMD5(): String? {
-        // TODO EXPOSUREBACK-178
+
         val fileMD5 = values("ETag").singleOrNull()
+//  TODO EXPOSUREBACK-178
 //                var fileMD5 = headers.values("x-amz-meta-cwa-hash-md5").singleOrNull()
 //                if (fileMD5 == null) {
 //                    headers.values("x-amz-meta-cwa-hash").singleOrNull()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
index 6b88e9aef3266b4c4485c145cac41bd9de26cb97..036905b788a065b9b14684da8811ad8b42bd32f4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
@@ -199,11 +199,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
                 .asyncRetrieveApplicationConfiguration()
                 .supportedCountriesList
         }
-
-        if (CWADebug.isDebugBuildOrMode) {
-            onKeyFilesDownloadStarted?.invoke()
-            onKeyFilesDownloadStarted = null
-        }
+            invokeSubmissionStartedInDebugOrBuildMode()
 
         val availableKeyFiles = executeFetchKeyFilesFromServer(countries)
 
@@ -218,11 +214,7 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
 
             onKeyFilesDownloadFinished?.invoke(availableKeyFiles.size, totalFileSize)
             onKeyFilesDownloadFinished = null
-        }
-
-        if (CWADebug.isDebugBuildOrMode) {
-            onApiSubmissionStarted?.invoke()
-            onApiSubmissionStarted = null
+            invokeSubmissionStartedInDebugOrBuildMode()
         }
 
         val isSubmissionSuccessful = executeAPISubmission(
@@ -231,16 +223,27 @@ object RetrieveDiagnosisKeysTransaction : Transaction() {
             token = token
         )
 
-        if (CWADebug.isDebugBuildOrMode) {
-            onApiSubmissionFinished?.invoke()
-            onApiSubmissionFinished = null
-        }
+        invokeSubmissionFinishedInDebugOrBuildMode()
 
         if (isSubmissionSuccessful) executeFetchDateUpdate(currentDate)
 
         executeClose()
     }
 
+    private fun invokeSubmissionStartedInDebugOrBuildMode() {
+        if (CWADebug.isDebugBuildOrMode) {
+            onApiSubmissionStarted?.invoke()
+            onApiSubmissionStarted = null
+        }
+    }
+
+    private fun invokeSubmissionFinishedInDebugOrBuildMode() {
+        if (CWADebug.isDebugBuildOrMode) {
+            onApiSubmissionFinished?.invoke()
+            onApiSubmissionFinished = null
+        }
+    }
+
     override suspend fun rollback() {
         super.rollback()
         try {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
index 704b7f3cf9142a75eb006c2f91ddc5468fbf5b3b..9216658159f461c879eb6e90f3411dcdd76f65db 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
@@ -156,17 +156,15 @@ class SubmissionQRCodeScanFragment : Fragment(R.layout.fragment_submission_qr_co
         permissions: Array<String>,
         grantResults: IntArray
     ) {
-        if (requestCode == REQUEST_CAMERA_PERMISSION_CODE) {
-
-            // permission was denied
-            if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_DENIED)) {
+        // if permission was denied
+        if (requestCode == REQUEST_CAMERA_PERMISSION_CODE &&
+            (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_DENIED)) {
                 if (shouldShowRequestPermissionRationale(Manifest.permission.CAMERA)) {
                     showCameraPermissionRationaleDialog()
                 } else {
                     // user permanently denied access to the camera
                     showCameraPermissionDeniedDialog()
                 }
-            }
         }
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/GoogleAPIVersion.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/GoogleAPIVersion.kt
index cb6f64f5b0f97c1efed5b1b4dc4a9dfc10dffd18..6af00068b370a93acc562d74cf16b23d8819617c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/GoogleAPIVersion.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/GoogleAPIVersion.kt
@@ -22,8 +22,10 @@ class GoogleAPIVersion @Inject constructor() {
             val currentVersion = InternalExposureNotificationClient.getVersion()
             currentVersion >= compareVersion
         } catch (apiException: ApiException) {
-            if (apiException.statusCode == CommonStatusCodes.API_NOT_CONNECTED) false
-            else throw apiException
+            if (apiException.statusCode != CommonStatusCodes.API_NOT_CONNECTED) {
+                throw apiException
+            }
+            return false
         }
     }