Merge branch 'device-list-not-capitalized-droid-415'

mullvad · Oct 18, 2023 · b1271e7 · b1271e7
2 parents 38bf0c5 + 5cbd9e4
commit b1271e7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -193,7 +193,7 @@ fun DeviceListScreen(
                         Column {
                             state.deviceUiItems.forEach { deviceUiState ->
                                 ListItem(
-                                    text = deviceUiState.device.name,
+                                    text = deviceUiState.device.displayName(),
                                     subText =
                                         deviceUiState.device.created.parseAsDateTime()?.let {
                                             creationDate ->

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
@@ -126,7 +126,7 @@ class WelcomeViewModelTest {
             // Arrange
             val expectedAccountNumber = "4444555566667777"
             val device: Device = mockk()
-            every { device.name } returns ""
+            every { device.displayName() } returns ""
 
             // Act, Assert
             viewModel.uiState.test {

diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt
@@ -25,4 +25,12 @@ data class Device(val id: String, val name: String, val pubkey: ByteArray, val c
         result = 31 * result + pubkey.contentHashCode()
         return result
     }
+
+    fun displayName(): String = name.capitalizeFirstCharOfEachWord()
+}
+
+private fun String.capitalizeFirstCharOfEachWord(): String {
+    return split(" ")
+        .joinToString(" ") { word -> word.replaceFirstChar { firstChar -> firstChar.uppercase() } }
+        .trimEnd()
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt
@@ -19,16 +19,10 @@ sealed class DeviceState : Parcelable {
     }
 
     fun deviceName(): String? {
-        return (this as? LoggedIn)?.accountAndDevice?.device?.name?.capitalizeFirstCharOfEachWord()
+        return (this as? LoggedIn)?.accountAndDevice?.device?.displayName()
     }
 
     fun token(): String? {
         return (this as? LoggedIn)?.accountAndDevice?.account_token
     }
 }
-
-private fun String.capitalizeFirstCharOfEachWord(): String {
-    return split(" ")
-        .joinToString(" ") { word -> word.replaceFirstChar { firstChar -> firstChar.uppercase() } }
-        .trimEnd()
-}