Add UI for importing bookmarks from Google

Author: CDRussell

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/takeout/webflow/ImportGoogleBookmarksWebFlowFragment.kt

@@ -53,6 +53,7 @@ import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookma
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.Command.InjectCredentialsFromReauth
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.Command.NoCredentialsAvailable
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.Command.PromptUserToSelectFromStoredCredentials
+import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.HideWebPage
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.Initializing
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.LoadingWebPage
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.NavigatingBack
@@ -64,6 +65,8 @@ import com.duckduckgo.autofill.impl.jsbridge.request.SupportedAutofillInputSubTy
 import com.duckduckgo.autofill.impl.jsbridge.request.SupportedAutofillInputSubType.PASSWORD
 import com.duckduckgo.autofill.impl.store.ReAuthenticationDetails
 import com.duckduckgo.common.ui.DuckDuckGoFragment
+import com.duckduckgo.common.ui.view.hide
+import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.FragmentViewModelFactory
 import com.duckduckgo.common.utils.plugins.PluginPoint
@@ -174,7 +177,14 @@ class ImportGoogleBookmarksWebFlowFragment :
                     is LoadingWebPage -> loadFirstWebpage(viewState.url)
                     is NavigatingBack -> binding?.webView?.goBack()
                     is Initializing -> {}
-                    is ShowWebPage -> {}
+                    is ShowWebPage -> {
+                        binding?.webView?.show()
+                        logcat { "cdr showing webview ${Thread.currentThread().name}" }
+                    }
+                    is HideWebPage -> {
+                        binding?.webView?.hide()
+                        logcat { "cdr hiding webview ${Thread.currentThread().name}" }
+                    }
                 }
             }.launchIn(lifecycleScope)
     }
@@ -327,6 +337,7 @@ class ImportGoogleBookmarksWebFlowFragment :
     private fun getToolbar() = (activity as ImportGoogleBookmarksWebFlowActivity).binding.includeToolbar.toolbar
 
     override fun onPageStarted(url: String?) {
+        viewModel.onPageStarted(url)
         lifecycleScope.launch(dispatchers.main()) {
             binding?.let {
                 val reauthDetails = url?.let { viewModel.getReauthData(url) } ?: ReAuthenticationDetails()

autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/takeout/webflow/ImportGoogleBookmarksWebFlowViewModel.kt

@@ -16,6 +16,7 @@
 
 package com.duckduckgo.autofill.impl.importing.takeout.webflow
 
+import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.duckduckgo.anvil.annotations.ContributesViewModel
@@ -24,6 +25,8 @@ import com.duckduckgo.autofill.api.domain.app.LoginCredentials
 import com.duckduckgo.autofill.api.domain.app.LoginTriggerType
 import com.duckduckgo.autofill.impl.importing.takeout.processor.TakeoutBookmarkImporter
 import com.duckduckgo.autofill.impl.importing.takeout.store.BookmarkImportConfigStore
+import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.HideWebPage
+import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.ShowWebPage
 import com.duckduckgo.autofill.impl.importing.takeout.zip.TakeoutBookmarkExtractor
 import com.duckduckgo.autofill.impl.importing.takeout.zip.TakeoutBookmarkExtractor.ExtractionResult
 import com.duckduckgo.autofill.impl.importing.takeout.zip.TakeoutZipDownloader
@@ -181,7 +184,7 @@ class ImportGoogleBookmarksWebFlowViewModel @Inject constructor(
     }
 
     fun firstPageLoading() {
-        _viewState.value = ViewState.ShowWebPage
+        _viewState.value = ShowWebPage
     }
 
     suspend fun getReauthData(originalUrl: String): ReAuthenticationDetails? {
@@ -248,6 +251,15 @@ class ImportGoogleBookmarksWebFlowViewModel @Inject constructor(
         reauthenticationHandler.storeForReauthentication(currentUrl, credentials.password)
     }
 
+    fun onPageStarted(url: String?) {
+        val host = url?.toUri()?.host ?: return
+        _viewState.value = if (host.contains("takeout.google.com", ignoreCase = true)) {
+            HideWebPage
+        } else {
+            ShowWebPage
+        }
+    }
+
     sealed interface Command {
         data class InjectCredentialsFromReauth(val url: String? = null, val username: String = "", val password: String?) : Command
         data class PromptUserToSelectFromStoredCredentials(
@@ -263,6 +275,7 @@ class ImportGoogleBookmarksWebFlowViewModel @Inject constructor(
     sealed interface ViewState {
         data object Initializing : ViewState
         data object ShowWebPage : ViewState
+        data object HideWebPage : ViewState
         data class LoadingWebPage(val url: String) : ViewState
         data class UserCancelledImportFlow(val stage: String) : ViewState
         data class UserFinishedCannotImport(val reason: UserCannotImportReason) : ViewState

autofill/autofill-impl/src/test/java/com/duckduckgo/autofill/impl/importing/takeout/webflow/ImportGoogleBookmarksWebFlowViewModelTest.kt

@@ -3,6 +3,7 @@ package com.duckduckgo.autofill.impl.importing.takeout.webflow
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.test
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.Command
+import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.HideWebPage
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.NavigatingBack
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.ShowWebPage
 import com.duckduckgo.autofill.impl.importing.takeout.webflow.ImportGoogleBookmarksWebFlowViewModel.ViewState.UserCancelledImportFlow
@@ -42,6 +43,50 @@ class ImportGoogleBookmarksWebFlowViewModelTest {
         bookmarkImportConfigStore = mock(),
     )
 
+    @Test
+    fun whenOnPageStartedWithTakeoutUrlThenHideWebPage() = runTest {
+        testee.onPageStarted("https://takeout.google.com")
+        assertEquals(HideWebPage, testee.viewState.value)
+    }
+
+    @Test
+    fun whenOnPageStartedWithUppercaseTakeoutUrlThenHideWebPage() = runTest {
+        testee.onPageStarted("https://TAKEOUT.GOOGLE.COM")
+        assertEquals(HideWebPage, testee.viewState.value)
+    }
+
+    @Test
+    fun whenOnPageStartedWithAccountsGoogleUrlThenShowWebPage() = runTest {
+        testee.onPageStarted("https://accounts.google.com/signin")
+        assertEquals(ShowWebPage, testee.viewState.value)
+    }
+
+    @Test
+    fun whenOnPageStartedWithExampleUrlThenShowWebPage() = runTest {
+        testee.onPageStarted("https://example.com/page")
+        assertEquals(ShowWebPage, testee.viewState.value)
+    }
+
+    @Test
+    fun whenOnPageStartedWithAccountsGoogleUrlContainingTakeoutInPathThenShowWebPage() = runTest {
+        testee.onPageStarted("https://accounts.google.com/signin?continue=https://takeout.google.com")
+        assertEquals(ShowWebPage, testee.viewState.value)
+    }
+
+    @Test
+    fun whenOnPageStartedWithNullUrlThenViewStateRemainsUnchanged() = runTest {
+        val initialState = testee.viewState.value
+        testee.onPageStarted(null)
+        assertEquals(initialState, testee.viewState.value)
+    }
+
+    @Test
+    fun whenOnPageStartedWithMalformedUrlThenViewStateRemainsUnchanged() = runTest {
+        val initialState = testee.viewState.value
+        testee.onPageStarted("not-a-valid-url")
+        assertEquals(initialState, testee.viewState.value)
+    }
+
     @Test
     fun whenFirstPageLoadingThenShowWebPageState() = runTest {
         testee.firstPageLoading()