simplified logic

corona-warn-app · Oct 7, 2020 · a419e5b · a419e5b
1 parent 0267c84
commit a419e5b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
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
@@ -22,15 +22,13 @@ class GoogleAPIVersion @Inject constructor() {
             val currentVersion = InternalExposureNotificationClient.getVersion()
             currentVersion >= compareVersion
         } catch (apiException: ApiException) {
-            isGoogleAPIConnected(apiException)
+            if (apiException.statusCode == CommonStatusCodes.API_NOT_CONNECTED) {
+                throw apiException
+            }
+            return false
         }
     }
 
-    private fun isGoogleAPIConnected(apiException: ApiException): Boolean {
-        if (apiException.statusCode != CommonStatusCodes.API_NOT_CONNECTED) throw apiException
-        else return false
-    }
-
     // check if a raw long has the correct length to be considered an API version
     private val Long.isCorrectVersionLength
         get(): Boolean = abs(this).toString().length == GOOGLE_API_VERSION_FIELD_LENGTH