summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-11-26 14:43:31 +0100
committerDavid Göransson <david.goransson@mullvad.net>2024-11-27 09:00:18 +0100
commitc4a46cfedec2ae578cf3b16bba53bb0ac98efa97 (patch)
tree6279c6fd0840d55897c57d2a92ee965c2e87db9b /android/lib
parent9caa72549ec7f9472eb055ae7c1830d88a4ca756 (diff)
downloadmullvadvpn-c4a46cfedec2ae578cf3b16bba53bb0ac98efa97.tar.xz
mullvadvpn-c4a46cfedec2ae578cf3b16bba53bb0ac98efa97.zip
Fix usecase
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt4
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/PrepareVpnUseCase.kt (renamed from android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VpnProfileUseCase.kt)4
-rw-r--r--android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt8
3 files changed, 8 insertions, 8 deletions
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt
index 08a0a517f0..baf404d89c 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt
@@ -11,7 +11,7 @@ import net.mullvad.mullvadvpn.lib.model.TunnelState
class ConnectionProxy(
private val managementService: ManagementService,
translationRepository: RelayLocationTranslationRepository,
- private val vpnProfileUseCase: VpnProfileUseCase,
+ private val prepareVpnUseCase: PrepareVpnUseCase,
) {
val tunnelState =
combine(managementService.tunnelState, translationRepository.translations) {
@@ -34,7 +34,7 @@ class ConnectionProxy(
copy(city = translations[city] ?: city, country = translations[country] ?: country)
suspend fun connect(): Either<ConnectError, Boolean> = either {
- vpnProfileUseCase.prepareVpn().mapLeft(ConnectError::NotPrepared).bind()
+ prepareVpnUseCase.invoke().mapLeft(ConnectError::NotPrepared).bind()
managementService.connect().bind()
}
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VpnProfileUseCase.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/PrepareVpnUseCase.kt
index cebac0be04..7f7ec88120 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VpnProfileUseCase.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/PrepareVpnUseCase.kt
@@ -6,6 +6,6 @@ import net.mullvad.mullvadvpn.lib.common.util.prepareVpnSafe
import net.mullvad.mullvadvpn.lib.model.PrepareError
import net.mullvad.mullvadvpn.lib.model.Prepared
-class VpnProfileUseCase(private val applicationContext: Context) {
- fun prepareVpn(): Either<PrepareError, Prepared> = applicationContext.prepareVpnSafe()
+class PrepareVpnUseCase(private val applicationContext: Context) {
+ fun invoke(): Either<PrepareError, Prepared> = applicationContext.prepareVpnSafe()
}
diff --git a/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt b/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
index 24a14ce782..b9d276c34b 100644
--- a/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
+++ b/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
@@ -17,20 +17,20 @@ import org.junit.jupiter.api.Test
class ConnectionProxyTest {
private val mockManagementService: ManagementService = mockk(relaxed = true)
- private val mockVpnPermissionRepository: VpnProfileUseCase = mockk()
+ private val mockVpnPermissionRepository: PrepareVpnUseCase = mockk()
private val mockTranslationRepository: RelayLocationTranslationRepository =
mockk(relaxed = true)
private val connectionProxy: ConnectionProxy =
ConnectionProxy(
managementService = mockManagementService,
- vpnProfileUseCase = mockVpnPermissionRepository,
+ prepareVpnUseCase = mockVpnPermissionRepository,
translationRepository = mockTranslationRepository,
)
@Test
fun `connect with vpn permission allowed should call managementService connect`() = runTest {
- every { mockVpnPermissionRepository.prepareVpn() } returns Prepared.right()
+ every { mockVpnPermissionRepository.invoke() } returns Prepared.right()
connectionProxy.connect()
coVerify(exactly = 1) { mockManagementService.connect() }
}
@@ -38,7 +38,7 @@ class ConnectionProxyTest {
@Test
fun `connect with vpn permission not allowed should not call managementService connect`() =
runTest {
- every { mockVpnPermissionRepository.prepareVpn() } returns
+ every { mockVpnPermissionRepository.invoke() } returns
PrepareError.NotPrepared(Intent()).left()
connectionProxy.connect()
coVerify(exactly = 0) { mockManagementService.connect() }