Fix UUID thingy

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt

@@ -33,7 +33,7 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
 @Composable
 private fun PreviewRemoveDeviceConfirmationDialog() {
     AppTheme {
-        RemoveDeviceConfirmationDialog(EmptyResultBackNavigator(), device = generateDevice())
+        RemoveDeviceConfirmationDialog(EmptyResultBackNavigator(), device = generateDevice(0))
     }
 }
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/PreviewData.kt

@@ -81,16 +81,18 @@ private fun generateHostname(city: GeoLocationId.City, index: Int) =
 
 private const val CITY_CODE_LENGTH = 3
 
-fun generateDevices(count: Int) = List(count) { generateDevice() }
+fun generateDevices(count: Int) = List(count) { index -> generateDevice(index) }
 
 fun generateDevice(
-    id: DeviceId = DeviceId(UUID.randomUUID()),
+    index: Int,
+    id: String = UUID,
     name: String? = null,
 ) =
     Device(
-        id = id,
-        name = name ?: "Device ${id.value.toString().take(DEVICE_SUFFIX_LENGTH)}",
+        id = DeviceId.fromString(id),
+        name = name ?: "Device $index-${id.take(DEVICE_SUFFIX_LENGTH)}",
         DateTime.now()
     )
 
 private const val DEVICE_SUFFIX_LENGTH = 4
+private const val UUID = "12345678-1234-5678-1234-567812345678"

android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt

@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.repository
 
-import java.util.UUID
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
@@ -21,7 +20,6 @@ enum class StatusLevel {
 }
 
 sealed class InAppNotification {
-    val uuid: UUID = UUID.randomUUID()
     abstract val statusLevel: StatusLevel
     abstract val priority: Long
 

android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/NewDeviceUseNotificationCaseTest.kt

@@ -27,11 +27,7 @@ class NewDeviceUseNotificationCaseTest {
     private val deviceName = "Frank Zebra"
     private val deviceState =
         MutableStateFlow<Device?>(
-            Device(
-                id = DeviceId.fromString(UUID.randomUUID().toString()),
-                name = deviceName,
-                creationDate = DateTime.now()
-            )
+            Device(id = DeviceId.fromString(UUID), name = deviceName, creationDate = DateTime.now())
         )
     private lateinit var newDeviceNotificationUseCase: NewDeviceNotificationUseCase
 
@@ -82,4 +78,8 @@ class NewDeviceUseNotificationCaseTest {
             assertEquals(awaitItem(), emptyList())
         }
     }
+
+    companion object {
+        private const val UUID = "12345678-1234-5678-1234-567812345678"
+    }
 }

android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModelTest.kt

@@ -43,11 +43,7 @@ class AccountViewModelTest {
     private val accountExpiryState = MutableStateFlow(null)
 
     private val dummyDevice =
-        Device(
-            id = DeviceId.fromString(java.util.UUID.randomUUID().toString()),
-            name = "fake_name",
-            creationDate = DateTime.now()
-        )
+        Device(id = DeviceId.fromString(UUID), name = "fake_name", creationDate = DateTime.now())
     private val dummyAccountToken: AccountToken =
         AccountToken(
             DUMMY_DEVICE_NAME,
@@ -215,5 +211,6 @@ class AccountViewModelTest {
         private const val PURCHASE_RESULT_EXTENSIONS_CLASS =
             "net.mullvad.mullvadvpn.util.PurchaseResultExtensionsKt"
         private const val DUMMY_DEVICE_NAME = "fake_name"
+        private const val UUID = "12345678-1234-5678-1234-567812345678"
     }
 }