Fixed some issues

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

@@ -26,7 +26,6 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling
 import net.mullvad.mullvadvpn.usecase.AccountExpiryNotificationUseCase
 import net.mullvad.mullvadvpn.usecase.ConnectivityUseCase
-import net.mullvad.mullvadvpn.usecase.CustomListsUseCase
 import net.mullvad.mullvadvpn.usecase.EmptyPaymentUseCase
 import net.mullvad.mullvadvpn.usecase.NewDeviceNotificationUseCase
 import net.mullvad.mullvadvpn.usecase.OutOfTimeUseCase
@@ -110,7 +109,6 @@ val uiModule = module {
     single { RelayListUseCase(get(), get()) }
     single { OutOfTimeUseCase(get(), get()) }
     single { ConnectivityUseCase(get()) }
-    single { CustomListsUseCase(get()) }
 
     single { InAppNotificationController(get(), get(), get(), get(), MainScope()) }
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/CustomListExtensions.kt

@@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.relaylist
 import net.mullvad.mullvadvpn.model.CustomList
 
 fun CustomList.toRelayItemList(relayCountries: List<RelayCountry>): CustomRelayItemList =
-    // return this.items.map { RelayItem(it) }
     CustomRelayItemList(
         id = this.id,
         name = this.name,

android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListExtensions.kt

@@ -70,23 +70,23 @@ fun RelayList.toRelayCountries(
 }
 
 fun List<RelayCountry>.findItemForGeographicLocationConstraint(
-    location: GeographicLocationConstraint
+    constraint: GeographicLocationConstraint
 ) =
-    when (location) {
+    when (constraint) {
         is GeographicLocationConstraint.Country -> {
-            this.find { country -> country.code == location.countryCode }
+            this.find { country -> country.code == constraint.countryCode }
         }
         is GeographicLocationConstraint.City -> {
-            val country = this.find { country -> country.code == location.countryCode }
+            val country = this.find { country -> country.code == constraint.countryCode }
 
-            country?.cities?.find { city -> city.code == location.cityCode }
+            country?.cities?.find { city -> city.code == constraint.cityCode }
         }
         is GeographicLocationConstraint.Hostname -> {
-            val country = this.find { country -> country.code == location.countryCode }
+            val country = this.find { country -> country.code == constraint.countryCode }
 
-            val city = country?.cities?.find { city -> city.code == location.cityCode }
+            val city = country?.cities?.find { city -> city.code == constraint.cityCode }
 
-            city?.relays?.find { relay -> relay.name == location.hostname }
+            city?.relays?.find { relay -> relay.name == constraint.hostname }
         }
     }
 
@@ -230,7 +230,7 @@ private fun List<RelayCountry>.expandItemForSelection(
                     }
                 }
             }
-            else -> this
+            null -> this
         }
     } ?: this
 }

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

@@ -12,7 +12,7 @@ class CustomListsRepository(private val messageHandler: MessageHandler) {
         val result = messageHandler.trySendRequest(Request.CreateCustomList(name))
 
         return if (result) {
-            messageHandler.events<Event.CreateCustomListResultEvent>().first().result
+            messageHandler.events<Event.CreateCustomListResult>().first().listId
         } else {
             null
         }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/CustomListsUseCase.kt

@@ -65,7 +65,7 @@ sealed class Event : Message.EventMessage() {
 
     @Parcelize object VpnPermissionRequest : Event()
 
-    @Parcelize data class CreateCustomListResultEvent(val result: String) : Event()
+    @Parcelize data class CreateCustomListResult(val listId: String) : Event()
 
     companion object {
         private const val MESSAGE_KEY = "event"

android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt

@@ -40,7 +40,7 @@ class CustomLists(
 
     private suspend fun createCustomList(name: String) {
         val result = daemon.await().createCustomList(name)
-        endpoint.sendEvent(Event.CreateCustomListResultEvent(result))
+        endpoint.sendEvent(Event.CreateCustomListResult(result))
     }
 
     fun onDestroy() {