Fixed init connection being blocked

Author: kp-iva-nedeleva

build.gradle

@@ -12,7 +12,7 @@ plugins {
 
 allprojects {
     group = "com.kape.android"
-    version = "0.4.9"
+    version = "0.4.10"
 
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 

vpnmanager/vpnservicemanager/src/main/java/com/kape/vpnservicemanager/domain/controllers/StartConnectionController.kt

@@ -66,7 +66,14 @@ internal class StartConnectionController(
     override suspend fun invoke(
         protocolConfiguration: VPNServiceManagerConfiguration,
     ): Result<VPNServiceServerPeerInformation> {
-        return isServiceCleared()
+        val precondition = if (isServiceCleared().isFailure) {
+            stopConnection(DisconnectReason.CLIENT_INITIATED)
+                .mapCatching { clearCache().getOrThrow() }
+        } else {
+            Result.success(Unit)
+        }
+
+        return precondition
             .mapCatching {
                 setProtocolConfiguration(
                     protocolConfiguration = protocolConfiguration

vpnmanager/vpnservicemanager/src/test/java/com/kape/vpnservicemanager/domain/controllers/StartConnectionControllerTest.kt

@@ -127,7 +127,7 @@ internal class StartConnectionControllerTest {
     }
 
     @Test
-    fun `fail to start when there is a service present`() = runTest {
+    fun `start successfully when there is a service present and stop succeeds`() = runTest {
         // given
         val context: Context = ApplicationProvider.getApplicationContext()
         val protocolConfiguration: VPNServiceManagerConfiguration =
@@ -160,6 +160,46 @@ internal class StartConnectionControllerTest {
         // when
         val result = startConnectionController(protocolConfiguration = protocolConfiguration)
 
+        // then
+        assert(result.isSuccess)
+        assert((stopConnectionMock as StopConnectionMock).invocationsCounter == 1)
+        assert((clearCacheMock as ClearCacheMock).invocationsCounter == 1)
+    }
+
+    @Test
+    fun `fail to start when there is a service present and stop fails`() = runTest {
+        // given
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val protocolConfiguration: VPNServiceManagerConfiguration =
+            GivenModel.vpnServiceManagerConfiguration(context = context)
+        val isServiceClearedMock: IIsServiceCleared = IsServiceClearedMock(shouldSucceed = false)
+        val setProtocolConfigurationMock: ISetProtocolConfiguration =
+            SetProtocolConfigurationMock(shouldSucceed = true)
+        val setServerPeerInformationMock: ISetServerPeerInformation =
+            SetServerPeerInformationMock(shouldSucceed = true)
+        val startConnectionMock: IStartConnection = StartConnectionMock(shouldSucceed = true)
+        val startReconnectionHandlerMock: IStartReconnectionHandler =
+            StartReconnectionHandlerMock(shouldSucceed = true)
+        val getServerPeerInformationMock: IGetServerPeerInformation =
+            GetServerPeerInformationMock(shouldSucceed = true)
+        val stopConnectionMock: IStopConnection = StopConnectionMock(shouldSucceed = false)
+        val clearCacheMock: IClearCache = ClearCacheMock()
+        val startConnectionController: IStartConnectionController =
+            GivenController.startConnectionController(
+                context = context,
+                isServiceCleared = isServiceClearedMock,
+                setProtocolConfiguration = setProtocolConfigurationMock,
+                setServerPeerInformation = setServerPeerInformationMock,
+                startConnection = startConnectionMock,
+                startReconnectionHandler = startReconnectionHandlerMock,
+                getServerPeerInformation = getServerPeerInformationMock,
+                stopConnection = stopConnectionMock,
+                clearCache = clearCacheMock
+            )
+
+        // when
+        val result = startConnectionController(protocolConfiguration = protocolConfiguration)
+
         // then
         assert(result.isFailure)
     }