1 files changed, 6 insertions, 9 deletions
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)
         }
     }
 }