Merge branch 'try-replacing-ktfmt-with-detekt-droid-559'

4 files changed, 21 insertions, 31 deletions

diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt
index f9239516d9..6b3098fad0 100644
--- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt
+++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt
@@ -131,12 +131,8 @@ class BillingRepository(context: Context) {
             val activity = activityProvider()
             // Launch the billing flow
             billingClient.launchBillingFlow(activity, billingFlowParams)
-        } catch (t: Throwable) {
-            if (t is BillingException) {
-                t.toBillingResult()
-            } else {
-                throw t
-            }
+        } catch (t: BillingException) {
+            t.toBillingResult()
         }
     }
 
@@ -150,15 +146,12 @@ class BillingRepository(context: Context) {
                     .build()
 
             billingClient.queryPurchasesAsync(queryPurchaseHistoryParams)
-        } catch (t: Throwable) {
-            if (t is BillingException) {
-                t.toPurchasesResult()
-            } else {
-                throw t
-            }
+        } catch (t: BillingException) {
+            t.toPurchasesResult()
         }
     }
 
+    @Suppress("TooGenericExceptionCaught")
     private suspend fun queryProductDetails(productIds: List<String>): ProductDetailsResult {
         return try {
             ensureConnected()
@@ -174,15 +167,13 @@ class BillingRepository(context: Context) {
             params.setProductList(productList)
 
             billingClient.queryProductDetails(params.build())
+        } catch (billingException: BillingException) {
+            ProductDetailsResult(billingException.toBillingResult(), null)
         } catch (t: Throwable) {
-            if (t is BillingException) {
-                return ProductDetailsResult(t.toBillingResult(), null)
-            } else {
-                return ProductDetailsResult(
-                    BillingResult.newBuilder().setResponseCode(BillingResponseCode.ERROR).build(),
-                    null
-                )
-            }
+            ProductDetailsResult(
+                BillingResult.newBuilder().setResponseCode(BillingResponseCode.ERROR).build(),
+                null
+            )
         }
     }
 }
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/CommonStringExtensions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/CommonStringExtensions.kt
index 06a2de9148..536fea3d24 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/CommonStringExtensions.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/CommonStringExtensions.kt
@@ -10,7 +10,9 @@ private const val SPACE_CHAR = ' '
 fun String.parseAsDateTime(): DateTime? {
     return try {
         DateTime.parse(this, DateTimeFormat.forPattern(EXPIRY_FORMAT))
-    } catch (ex: Exception) {
+    } catch (ex: IllegalArgumentException) {
+        null
+    } catch (ex: UnsupportedOperationException) {
         null
     }
 }
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlow.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlow.kt
index 4d60cf4d7b..7b839a3658 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlow.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlow.kt
@@ -27,15 +27,12 @@ class HandlerFlow<T>(looper: Looper, private val extractor: (Message) -> T) :
 
         try {
             channel.trySendBlocking(extractedData)
-        } catch (exception: Exception) {
-            when (exception) {
-                is ClosedSendChannelException,
-                is CancellationException -> {
-                    Log.w("mullvad", "Received a message after HandlerFlow was closed", exception)
-                    removeCallbacksAndMessages(null)
-                }
-                else -> throw exception
-            }
+        } catch (exception: ClosedSendChannelException) {
+            Log.w("mullvad", "Received a message after HandlerFlow was closed", exception)
+            removeCallbacksAndMessages(null)
+        } catch (exception: CancellationException) {
+            Log.w("mullvad", "Received a message after HandlerFlow was cancelled", exception)
+            removeCallbacksAndMessages(null)
         }
     }
 }
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 1d43b6f9f9..94b097fe13 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -141,7 +141,7 @@ open class TalpidVpnService : VpnService() {
         return when (address) {
             is Inet4Address -> 32
             is Inet6Address -> 128
-            else -> throw RuntimeException("Invalid IP address (not IPv4 nor IPv6)")
+            else -> throw IllegalArgumentException("Invalid IP address (not IPv4 nor IPv6)")
         }
     }