Fix screenshots scripts patch

1 files changed, 23 insertions, 23 deletions

diff --git a/android/scripts/screenshot/account_name_and_expiry.patch b/android/scripts/screenshot/account_name_and_expiry.patch
index 09bb76bc1d..f85f51da62 100644
--- a/android/scripts/screenshot/account_name_and_expiry.patch
+++ b/android/scripts/screenshot/account_name_and_expiry.patch
@@ -1,8 +1,8 @@
 diff --git a/android/lib/feature/login/impl/src/main/kotlin/net/mullvad/mullvadvpn/feature/login/impl/devicelist/DeviceListViewModel.kt b/android/lib/feature/login/impl/src/main/kotlin/net/mullvad/mullvadvpn/feature/login/impl/devicelist/DeviceListViewModel.kt
-index 341fe1c844..3a2fcdc4ea 100644
+index 2edf61e3f0..b66400a1aa 100644
 --- a/android/lib/feature/login/impl/src/main/kotlin/net/mullvad/mullvadvpn/feature/login/impl/devicelist/DeviceListViewModel.kt
 +++ b/android/lib/feature/login/impl/src/main/kotlin/net/mullvad/mullvadvpn/feature/login/impl/devicelist/DeviceListViewModel.kt
-@@ -53,7 +53,18 @@ class DeviceListViewModel(
+@@ -49,7 +49,18 @@ class DeviceListViewModel(
                      error != null -> DeviceListUiState.Error(error)
                      else ->
                          DeviceListUiState.Content(
@@ -23,31 +23,31 @@ index 341fe1c844..3a2fcdc4ea 100644
                  }
              }
 diff --git a/android/lib/feature/managedevices/impl/src/main/java/net/mullvad/mullvadvpn/feature/managedevices/impl/ManageDevicesViewModel.kt b/android/lib/feature/managedevices/impl/src/main/java/net/mullvad/mullvadvpn/feature/managedevices/impl/ManageDevicesViewModel.kt
-index 77d4771ab9..3b7b87f27f 100644
+index 2c0b9bbc64..01ad4e561a 100644
 --- a/android/lib/feature/managedevices/impl/src/main/java/net/mullvad/mullvadvpn/feature/managedevices/impl/ManageDevicesViewModel.kt
 +++ b/android/lib/feature/managedevices/impl/src/main/java/net/mullvad/mullvadvpn/feature/managedevices/impl/ManageDevicesViewModel.kt
-@@ -61,11 +61,15 @@ class ManageDevicesViewModel(
+@@ -55,11 +55,15 @@ class ManageDevicesViewModel(
+                     loading -> Lce.Loading(Unit)
                      error != null -> Lce.Error(error)
                      else -> {
-                         val deviceItems =
--                            devices.map {
-+                            devices.map { device ->
-                                 ManageDevicesItemUiState(
--                                    it,
--                                    loadingDevices.contains(it.id),
--                                    isCurrentDevice = it.id == currentDeviceState.device.id,
-+                                    device.let { dev ->
-+                                        if (dev.id == currentDeviceState.device.id)
-+                                            dev.copy(name = "Secure Mole")
-+                                        else dev
-+                                    },
-+                                    loadingDevices.contains(device.id),
-+                                    isCurrentDevice = device.id == currentDeviceState.device.id,
-                                 )
-                             }
+-                        val deviceItems = devices.map {
++                        val deviceItems = devices.map { device ->
+                             ManageDevicesItemUiState(
+-                                it,
+-                                loadingDevices.contains(it.id),
+-                                isCurrentDevice = it.id == currentDeviceState.device.id,
++                                device.let { dev ->
++                                    if (dev.id == currentDeviceState.device.id)
++                                        dev.copy(name = "Secure Mole")
++                                    else dev
++                                },
++                                loadingDevices.contains(device.id),
++                                isCurrentDevice = device.id == currentDeviceState.device.id,
+                             )
+                         }
                          Lce.Content(ManageDevicesUiState(deviceItems.sortedWith(deviceComparator)))
 diff --git a/android/lib/grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/grpc/mapper/ToDomain.kt b/android/lib/grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/grpc/mapper/ToDomain.kt
-index 656a910ad6..5cd4b0c3cf 100644
+index 1e2d27bd41..ffb1c5b121 100644
 --- a/android/lib/grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/grpc/mapper/ToDomain.kt
 +++ b/android/lib/grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/grpc/mapper/ToDomain.kt
 @@ -7,6 +7,7 @@ import java.net.InetAddress
@@ -58,7 +58,7 @@ index 656a910ad6..5cd4b0c3cf 100644
  import java.util.UUID
  import mullvad_daemon.management_interface.ManagementInterface
  import mullvad_daemon.management_interface.entryLocationOrNull
-@@ -624,7 +625,10 @@ internal fun ManagementInterface.Device.toDomain(): Device =
+@@ -652,7 +653,10 @@ internal fun ManagementInterface.Device.toDomain(): Device =
  internal fun ManagementInterface.DeviceState.toDomain(): DeviceState =
      when (state) {
          ManagementInterface.DeviceState.State.LOGGED_IN ->
@@ -70,7 +70,7 @@ index 656a910ad6..5cd4b0c3cf 100644
          ManagementInterface.DeviceState.State.LOGGED_OUT -> DeviceState.LoggedOut
          ManagementInterface.DeviceState.State.REVOKED -> DeviceState.Revoked
          ManagementInterface.DeviceState.State.UNRECOGNIZED ->
-@@ -636,7 +640,7 @@ internal fun ManagementInterface.AccountData.toDomain(accountNumber: AccountNumb
+@@ -664,7 +668,7 @@ internal fun ManagementInterface.AccountData.toDomain(accountNumber: AccountNumb
      AccountData(
          id = AccountId(UUID.fromString(id)),
          accountNumber = accountNumber,