Ensure terminal errors in the manual code flow also quits the pairing session

Author: CDRussell

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/ui/EnterCodeActivity.kt

@@ -153,7 +153,8 @@ class EnterCodeActivity : DuckDuckGoActivity() {
             is Command.AskJoinerConfirmation -> askJoinerConfirmation(command.peerName, command.peerKind)
             is Command.AskHostConfirmation -> askHostConfirmation(command.peerName, command.peerKind)
             Command.FinishWithError -> {
-                setResult(RESULT_CANCELED)
+                val resultIntent = Intent().putExtra(EXTRA_FINISHED_WITH_ERROR, true)
+                setResult(RESULT_CANCELED, resultIntent)
                 finish()
             }
         }
@@ -228,6 +229,7 @@ class EnterCodeActivity : DuckDuckGoActivity() {
         private const val EXTRA_CODE_TYPE = "codeType"
 
         const val EXTRA_USER_SWITCHED_ACCOUNT = "userSwitchedAccount"
+        const val EXTRA_FINISHED_WITH_ERROR = "finishedWithError"
 
         internal fun intent(context: Context, codeType: Code): Intent {
             return Intent(context, EnterCodeActivity::class.java).apply {

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/ui/SyncConnectActivity.kt

@@ -82,8 +82,15 @@ class SyncConnectActivity : DuckDuckGoActivity() {
     private val enterCodeLauncher = registerForActivityResult(
         EnterCodeContract(),
     ) { result ->
-        if (result != EnterCodeContractOutput.Error) {
-            viewModel.onLoginSuccess()
+        when (result) {
+            EnterCodeContractOutput.LoginSuccess,
+            EnterCodeContractOutput.SwitchAccountSuccess,
+            -> viewModel.onLoginSuccess()
+            EnterCodeContractOutput.Error -> {
+                setResult(RESULT_CANCELED)
+                finish()
+            }
+            EnterCodeContractOutput.Cancelled -> {}
         }
     }
 

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/ui/SyncLoginActivity.kt

@@ -59,8 +59,15 @@ class SyncLoginActivity : DuckDuckGoActivity() {
     private val enterCodeLauncher = registerForActivityResult(
         EnterCodeContract(),
     ) { result ->
-        if (result != EnterCodeContractOutput.Error) {
-            viewModel.onLoginSuccess()
+        when (result) {
+            EnterCodeContractOutput.LoginSuccess,
+            EnterCodeContractOutput.SwitchAccountSuccess,
+            -> viewModel.onLoginSuccess()
+            EnterCodeContractOutput.Error -> {
+                setResult(RESULT_CANCELED)
+                finish()
+            }
+            EnterCodeContractOutput.Cancelled -> {}
         }
     }
 

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/ui/SyncWithAnotherActivityViewModel.kt

@@ -443,7 +443,8 @@ class SyncWithAnotherActivityViewModel @Inject constructor(
     fun onEnterCodeResult(result: EnterCodeContractOutput) {
         viewModelScope.launch {
             when (result) {
-                EnterCodeContractOutput.Error -> {}
+                EnterCodeContractOutput.Error -> command.send(FinishWithError)
+                EnterCodeContractOutput.Cancelled -> {}
                 EnterCodeContractOutput.LoginSuccess -> {
                     // Manual entry: EnterCodeViewModel fires "Setup success"; only fire login pixel here.
                     syncPixels.fireLoginPixel()

sync/sync-impl/src/main/java/com/duckduckgo/sync/impl/ui/setup/EnterCodeContract.kt

@@ -22,6 +22,7 @@ import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
 import com.duckduckgo.sync.impl.ui.EnterCodeActivity
 import com.duckduckgo.sync.impl.ui.EnterCodeActivity.Companion.Code
+import com.duckduckgo.sync.impl.ui.EnterCodeActivity.Companion.EXTRA_FINISHED_WITH_ERROR
 import com.duckduckgo.sync.impl.ui.EnterCodeActivity.Companion.EXTRA_USER_SWITCHED_ACCOUNT
 import com.duckduckgo.sync.impl.ui.setup.EnterCodeContract.EnterCodeContractOutput
 
@@ -37,23 +38,18 @@ class EnterCodeContract : ActivityResultContract<Code, EnterCodeContractOutput>(
         resultCode: Int,
         intent: Intent?,
     ): EnterCodeContractOutput {
-        when {
-            resultCode == Activity.RESULT_OK -> {
-                val userSwitchedAccount = intent?.getBooleanExtra(EXTRA_USER_SWITCHED_ACCOUNT, false) ?: false
-                return if (userSwitchedAccount) {
-                    EnterCodeContractOutput.SwitchAccountSuccess
-                } else {
-                    EnterCodeContractOutput.LoginSuccess
-                }
-            }
-
-            else -> return EnterCodeContractOutput.Error
+        if (resultCode == Activity.RESULT_OK) {
+            val userSwitchedAccount = intent?.getBooleanExtra(EXTRA_USER_SWITCHED_ACCOUNT, false) ?: false
+            return if (userSwitchedAccount) EnterCodeContractOutput.SwitchAccountSuccess else EnterCodeContractOutput.LoginSuccess
         }
+        val finishedWithError = intent?.getBooleanExtra(EXTRA_FINISHED_WITH_ERROR, false) ?: false
+        return if (finishedWithError) EnterCodeContractOutput.Error else EnterCodeContractOutput.Cancelled
     }
 
     sealed class EnterCodeContractOutput {
         data object LoginSuccess : EnterCodeContractOutput()
         data object SwitchAccountSuccess : EnterCodeContractOutput()
         data object Error : EnterCodeContractOutput()
+        data object Cancelled : EnterCodeContractOutput()
     }
 }

sync/sync-impl/src/test/java/com/duckduckgo/sync/impl/ui/SyncWithAnotherDeviceViewModelTest.kt

@@ -74,6 +74,7 @@ import com.duckduckgo.sync.impl.ui.SyncWithAnotherActivityViewModel.Command.Logi
 import com.duckduckgo.sync.impl.ui.SyncWithAnotherActivityViewModel.Command.ShowError
 import com.duckduckgo.sync.impl.ui.SyncWithAnotherActivityViewModel.Command.ShowV2Error
 import com.duckduckgo.sync.impl.ui.SyncWithAnotherActivityViewModel.Command.SwitchAccountSuccess
+import com.duckduckgo.sync.impl.ui.setup.EnterCodeContract.EnterCodeContractOutput
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
@@ -795,6 +796,38 @@ class SyncWithAnotherDeviceViewModelTest {
         }
     }
 
+    @Test
+    fun whenEnterCodeReturnsErrorThenFinishWithError() = runTest {
+        testee.onEnterCodeResult(EnterCodeContractOutput.Error)
+
+        testee.commands().test {
+            val command = awaitItem()
+            assertTrue("expected FinishWithError, got $command", command is Command.FinishWithError)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun whenEnterCodeReturnsCancelledThenNoCommand() = runTest {
+        testee.onEnterCodeResult(EnterCodeContractOutput.Cancelled)
+
+        testee.commands().test {
+            expectNoEvents()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun whenEnterCodeReturnsLoginSuccessThenLoginSuccessCommand() = runTest {
+        testee.onEnterCodeResult(EnterCodeContractOutput.LoginSuccess)
+
+        testee.commands().test {
+            val command = awaitItem()
+            assertTrue("expected LoginSuccess, got $command", command is LoginSuccess)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
     @Test
     fun whenV2UpgradeRequiredThenShowUpdateError() = runTest {
         syncFeature.canUseV2ConnectFlow().setRawStoredState(State(true))