From cf8ec08c7bb40d878e158150abb0793a1ed6aecb Mon Sep 17 00:00:00 2001 From: Juraj Hilje Date: Tue, 13 Aug 2024 15:20:12 +0200 Subject: [PATCH] fix: update ServersPreference.kt --- .../net/ivpn/core/common/prefs/ServersPreference.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/net/ivpn/core/common/prefs/ServersPreference.kt b/core/src/main/java/net/ivpn/core/common/prefs/ServersPreference.kt index efe84ed30..281b6dd66 100644 --- a/core/src/main/java/net/ivpn/core/common/prefs/ServersPreference.kt +++ b/core/src/main/java/net/ivpn/core/common/prefs/ServersPreference.kt @@ -139,15 +139,15 @@ class ServersPreference @Inject constructor( fun setCurrentServer(serverType: ServerType?, server: Server?) { if (serverType == null || server == null) return - val openvpnServer = openvpnServersList?.first { it == server } - val wireguardServer = wireguardServersList?.first { it == server } + val openvpnServer = openvpnServersList?.firstOrNull { it == server } + val wireguardServer = wireguardServersList?.firstOrNull { it == server } val serverKey = if (serverType == ServerType.ENTRY) CURRENT_ENTER_SERVER else CURRENT_EXIT_SERVER preference.serversSharedPreferences.edit() - .putString(serverKey, Mapper.from(openvpnServer)) - .apply() + .putString(serverKey, Mapper.from(openvpnServer)) + .apply() preference.wireguardServersSharedPreferences.edit() - .putString(serverKey, Mapper.from(wireguardServer)) - .apply() + .putString(serverKey, Mapper.from(wireguardServer)) + .apply() } fun putOpenVpnServerList(servers: List?) {