Fix crash on device messenger communication

3 files changed, 91 insertions, 4 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt
index 6e445a6d34..56e7ee4d28 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSource.kt
@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.callbackFlow
 import net.mullvad.mullvadvpn.ipc.Event
 import net.mullvad.mullvadvpn.ipc.EventDispatcher
 import net.mullvad.mullvadvpn.ipc.Request
+import net.mullvad.mullvadvpn.util.trySendRequest
 
 class ServiceConnectionDeviceDataSource(
     private val connection: Messenger,
@@ -43,18 +44,18 @@ class ServiceConnectionDeviceDataSource(
 
     // Async result: Event.DeviceChanged
     fun refreshDevice() {
-        connection.send(Request.RefreshDeviceState.message)
+        connection.trySendRequest(Request.RefreshDeviceState, true)
     }
 
     fun getDevice() {
-        connection.send(Request.GetDevice.message)
+        connection.trySendRequest(Request.GetDevice, true)
     }
 
     fun removeDevice(accountToken: String, deviceId: String) {
-        connection.send(Request.RemoveDevice(accountToken, deviceId).message)
+        connection.trySendRequest(Request.RemoveDevice(accountToken, deviceId), true)
     }
 
     fun refreshDeviceList(accountToken: String) {
-        connection.send(Request.GetDeviceList(accountToken).message)
+        connection.trySendRequest(Request.GetDeviceList(accountToken), true)
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/MessengerExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/MessengerExtensions.kt
index 178358ef2e..71ce51ad79 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/MessengerExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/MessengerExtensions.kt
@@ -6,11 +6,16 @@ import android.os.Messenger
 import android.os.RemoteException
 import android.util.Log
 import net.mullvad.mullvadvpn.ipc.Event
+import net.mullvad.mullvadvpn.ipc.Request
 
 fun Messenger.trySendEvent(event: Event, logErrors: Boolean): Boolean {
     return trySend(event.message, logErrors, event::class.qualifiedName)
 }
 
+fun Messenger.trySendRequest(request: Request, logErrors: Boolean): Boolean {
+    return trySend(request.message, logErrors, request::class.qualifiedName)
+}
+
 private fun Messenger.trySend(message: Message, logErrors: Boolean, messageName: String?): Boolean {
     return try {
         this.send(message)
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/service/ServiceConnectionDeviceDataSourceTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/service/ServiceConnectionDeviceDataSourceTest.kt
new file mode 100644
index 0000000000..8b737cba69
--- /dev/null
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/service/ServiceConnectionDeviceDataSourceTest.kt
@@ -0,0 +1,81 @@
+package net.mullvad.mullvadvpn.service
+
+import android.os.DeadObjectException
+import android.os.Looper
+import android.os.Messenger
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import kotlin.reflect.KClass
+import net.mullvad.mullvadvpn.ipc.Event
+import net.mullvad.mullvadvpn.ipc.EventDispatcher
+import net.mullvad.mullvadvpn.ipc.Request
+import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionDeviceDataSource
+import net.mullvad.mullvadvpn.util.JobTracker
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class ServiceConnectionDeviceDataSourceTest {
+    private val tracker = JobTracker()
+
+    @MockK
+    private lateinit var mockedMainLooper: Looper
+
+    @MockK
+    private lateinit var mockedDispatchingHandler: EventDispatcher
+
+    @MockK
+    private lateinit var connection: Messenger
+
+    lateinit var serviceConnectionDeviceDataSource: ServiceConnectionDeviceDataSource
+
+    @Before
+    fun setup() {
+        mockkStatic(Looper::class)
+        mockkStatic(android.util.Log::class)
+        MockKAnnotations.init(this)
+        mockkObject(Request.GetDevice, Request.RefreshDeviceState)
+        every { Request.GetDevice.message } returns mockk()
+        every { Request.RefreshDeviceState.message } returns mockk()
+        every { Looper.getMainLooper() } returns mockedMainLooper
+        every { android.util.Log.e(any(), any()) } returns mockk(relaxed = true)
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun test_get_devices_list() {
+        // Arrange
+        every { connection.send(any()) } just Runs
+        every {
+            mockedDispatchingHandler.registerHandler(any<KClass<Event>>(), any())
+        } just Runs
+        // Act and Assert no crashes
+        serviceConnectionDeviceDataSource =
+            ServiceConnectionDeviceDataSource(connection, mockedDispatchingHandler)
+        serviceConnectionDeviceDataSource.getDevice()
+    }
+
+    @Test
+    fun test_catch_exception_on_devices_list() {
+        // Arrange
+        every { connection.send(any()) } throws DeadObjectException()
+        every {
+            mockedDispatchingHandler.registerHandler(any<KClass<Event>>(), any())
+        } just Runs
+        // Act and Assert no crashes
+        serviceConnectionDeviceDataSource =
+            ServiceConnectionDeviceDataSource(connection, mockedDispatchingHandler)
+        serviceConnectionDeviceDataSource.getDevice()
+    }
+}