summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-10-02 08:17:35 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-10-03 10:48:44 +0200
commit489c3930e129830b9fedcbca894d64f418d725ae (patch)
tree60b711b71a753f8d89b9556d0cc270390e8e34db /android/lib
parent2a5afe1ed0eda951f20670754dd445b2863df5d7 (diff)
downloadmullvadvpn-489c3930e129830b9fedcbca894d64f418d725ae.tar.xz
mullvadvpn-489c3930e129830b9fedcbca894d64f418d725ae.zip
Allow of refreshing of server list
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt6
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/UpdateRelayLocationsError.kt5
-rw-r--r--android/lib/resource/src/main/res/values/strings.xml2
3 files changed, 13 insertions, 0 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
index 3716e4d9c0..0a9266eb50 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -125,6 +125,7 @@ import net.mullvad.mullvadvpn.lib.model.UnknownApiAccessMethodError
import net.mullvad.mullvadvpn.lib.model.UnknownCustomListError
import net.mullvad.mullvadvpn.lib.model.UpdateApiAccessMethodError
import net.mullvad.mullvadvpn.lib.model.UpdateCustomListError
+import net.mullvad.mullvadvpn.lib.model.UpdateRelayLocationsError
import net.mullvad.mullvadvpn.lib.model.VoucherCode
import net.mullvad.mullvadvpn.lib.model.WebsiteAuthToken
import net.mullvad.mullvadvpn.lib.model.WireguardEndpointData as ModelWireguardEndpointData
@@ -882,6 +883,11 @@ class ManagementService(
.mapLeft(SetWireguardConstraintsError::Unknown)
.mapEmpty()
+ suspend fun updateRelayLocations(): Either<UpdateRelayLocationsError, Unit> =
+ Either.catch { grpc.updateRelayLocations(Empty.getDefaultInstance()) }
+ .mapLeft(UpdateRelayLocationsError::Unknown)
+ .mapEmpty()
+
private fun <A> Either<A, Empty>.mapEmpty() = map {}
private inline fun <B, C> Either<Throwable, B>.mapLeftStatus(
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/UpdateRelayLocationsError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/UpdateRelayLocationsError.kt
new file mode 100644
index 0000000000..97c475415e
--- /dev/null
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/UpdateRelayLocationsError.kt
@@ -0,0 +1,5 @@
+package net.mullvad.mullvadvpn.lib.model
+
+sealed interface UpdateRelayLocationsError {
+ data class Unknown(val throwable: Throwable) : UpdateRelayLocationsError
+}
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 45334336eb..03379ec5b8 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -438,4 +438,6 @@
<string name="open_app_details">Open app details</string>
<string name="no_matching_servers_found_first_line">No matching servers found.</string>
<string name="no_matching_servers_found_second_line">Please try changing your filters.</string>
+ <string name="refresh_server_list">Update server list</string>
+ <string name="updating_server_list_in_the_background">Updating server list in the background...</string>
</resources>