Skip to content

Commit 072a68b

Browse files
dbajpeyiCDRussell
dbajpeyi
authored and
CDRussell
committed
reuse the existing script
1 parent 4b695a9 commit 072a68b

File tree

27 files changed

+10970
-4815
lines changed

27 files changed

+10970
-4815
lines changed

‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/gpm/webflow/PasswordImporterCssScriptLoader.kt‎ renamed to ‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/gpm/webflow/GoogleImporterScriptLoader.kt‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,41 @@
1717
package com.duckduckgo.autofill.impl.importing.gpm.webflow
1818

1919
import com.duckduckgo.autofill.impl.importing.gpm.feature.AutofillImportPasswordConfigStore
20+
import com.duckduckgo.autofill.impl.importing.takeout.feature.BookmarkImportConfigStore
2021
import com.duckduckgo.common.utils.DispatcherProvider
2122
import com.duckduckgo.di.scopes.FragmentScope
2223
import com.squareup.anvil.annotations.ContributesBinding
2324
import java.io.BufferedReader
2425
import javax.inject.Inject
2526
import kotlinx.coroutines.withContext
2627

27-
interface PasswordImporterScriptLoader {
28-
suspend fun getScript(): String
28+
interface GoogleImporterScriptLoader {
29+
suspend fun getScriptForPasswordImport(): String
30+
suspend fun getScriptForBookmarkImport(): String
2931
}
3032

3133
@ContributesBinding(FragmentScope::class)
32-
class PasswordImporterCssScriptLoader @Inject constructor(
34+
class GoogleImporterScriptLoaderImpl @Inject constructor(
3335
private val dispatchers: DispatcherProvider,
34-
private val configStore: AutofillImportPasswordConfigStore,
35-
) : PasswordImporterScriptLoader {
36+
private val passwordConfigStore: AutofillImportPasswordConfigStore,
37+
private val bookmarkConfigStore: BookmarkImportConfigStore,
38+
) : GoogleImporterScriptLoader {
3639

3740
private lateinit var contentScopeJS: String
3841

39-
override suspend fun getScript(): String {
42+
override suspend fun getScriptForPasswordImport(): String {
4043
return withContext(dispatchers.io()) {
4144
getContentScopeJS()
42-
.replace(CONTENT_SCOPE_PLACEHOLDER, getContentScopeJson(loadSettingsJson()))
45+
.replace(CONTENT_SCOPE_PLACEHOLDER, getContentScopeScriptJson(loadSettingsJsonPassword()))
46+
.replace(USER_UNPROTECTED_DOMAINS_PLACEHOLDER, getUnprotectedDomainsJson())
47+
.replace(USER_PREFERENCES_PLACEHOLDER, getUserPreferencesJson())
48+
}
49+
}
50+
51+
override suspend fun getScriptForBookmarkImport(): String {
52+
return withContext(dispatchers.io()) {
53+
getContentScopeJS()
54+
.replace(CONTENT_SCOPE_PLACEHOLDER, getContentScopeScriptJson(loadSettingsJsonBookmark()))
4355
.replace(USER_UNPROTECTED_DOMAINS_PLACEHOLDER, getUnprotectedDomainsJson())
4456
.replace(USER_PREFERENCES_PLACEHOLDER, getUserPreferencesJson())
4557
}
@@ -49,10 +61,10 @@ class PasswordImporterCssScriptLoader @Inject constructor(
4961
* This enables the password import hints feature in C-S-S.
5062
* These settings are for enabling it; the check for whether it should be enabled or not is done elsewhere.
5163
*/
52-
private fun getContentScopeJson(settingsJson: String): String {
64+
private fun getContentScopeScriptJson(settingsJson: String): String {
5365
return """{
5466
"features":{
55-
"autofillPasswordImport" : {
67+
"autofillImport" : {
5668
"state": "enabled",
5769
"exceptions": [],
5870
"settings": $settingsJson
@@ -64,8 +76,12 @@ class PasswordImporterCssScriptLoader @Inject constructor(
6476
""".trimMargin()
6577
}
6678

67-
private suspend fun loadSettingsJson(): String {
68-
return configStore.getConfig().javascriptConfigGooglePasswords
79+
private suspend fun loadSettingsJsonPassword(): String {
80+
return passwordConfigStore.getConfig().javascriptConfigGooglePasswords
81+
}
82+
83+
private suspend fun loadSettingsJsonBookmark(): String {
84+
return bookmarkConfigStore.getConfig().javascriptConfigGoogleTakeout
6985
}
7086

7187
private fun getUserPreferencesJson(): String {
@@ -84,7 +100,7 @@ class PasswordImporterCssScriptLoader @Inject constructor(
84100

85101
private fun getContentScopeJS(): String {
86102
if (!this::contentScopeJS.isInitialized) {
87-
contentScopeJS = loadJs("autofillPasswordImport.js")
103+
contentScopeJS = loadJs("autofillImport.js")
88104
}
89105
return contentScopeJS
90106
}

‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/gpm/webflow/ImportGooglePasswordsWebFlowFragment.kt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import androidx.lifecycle.flowWithLifecycle
3333
import androidx.lifecycle.lifecycleScope
3434
import androidx.webkit.WebViewCompat
3535
import com.duckduckgo.anvil.annotations.InjectWith
36-
import com.duckduckgo.autofill.api.AutofillCapabilityChecker
3736
import com.duckduckgo.autofill.api.AutofillFragmentResultsPlugin
3837
import com.duckduckgo.autofill.api.BrowserAutofill
3938
import com.duckduckgo.autofill.api.CredentialAutofillDialogFactory
@@ -99,9 +98,6 @@ class ImportGooglePasswordsWebFlowFragment :
9998
@Inject
10099
lateinit var viewModelFactory: FragmentViewModelFactory
101100

102-
@Inject
103-
lateinit var autofillCapabilityChecker: AutofillCapabilityChecker
104-
105101
@Inject
106102
lateinit var credentialAutofillDialogFactory: CredentialAutofillDialogFactory
107103

@@ -115,7 +111,7 @@ class ImportGooglePasswordsWebFlowFragment :
115111
lateinit var passwordBlobConsumer: GooglePasswordBlobConsumer
116112

117113
@Inject
118-
lateinit var passwordImporterScriptLoader: PasswordImporterScriptLoader
114+
lateinit var googleImporterScriptLoader: GoogleImporterScriptLoader
119115

120116
@Inject
121117
lateinit var browserAutofillConfigurator: InternalBrowserAutofillConfigurator
@@ -343,7 +339,7 @@ class ImportGooglePasswordsWebFlowFragment :
343339
@SuppressLint("RequiresFeature", "AddDocumentStartJavaScriptUsage")
344340
private suspend fun configurePasswordImportJavascript(webView: WebView) {
345341
if (importPasswordConfig.getConfig().canInjectJavascript) {
346-
val script = passwordImporterScriptLoader.getScript()
342+
val script = googleImporterScriptLoader.getScriptForPasswordImport()
347343
WebViewCompat.addDocumentStartJavaScript(webView, script, setOf("*"))
348344
}
349345
}

‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/takeout/feature/BookmarkImportConfigStore.kt‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
* Copyright (c) 2025 DuckDuckGo
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.duckduckgo.autofill.impl.importing.takeout.feature
18+
19+
import com.duckduckgo.autofill.api.AutofillFeature
20+
import com.duckduckgo.common.utils.DispatcherProvider
21+
import com.duckduckgo.di.scopes.AppScope
22+
import com.squareup.anvil.annotations.ContributesBinding
23+
import com.squareup.moshi.JsonAdapter
24+
import com.squareup.moshi.Moshi
25+
import javax.inject.Inject
26+
import kotlinx.coroutines.withContext
27+
import org.json.JSONObject
28+
29+
interface BookmarkImportConfigStore {
30+
suspend fun getConfig(): BookmarkImportSettings
31+
}
32+
33+
data class BookmarkImportSettings(
34+
val canImportFromGoogleTakeout: Boolean,
35+
val launchUrlGoogleTakeout: String,
36+
val canInjectJavascript: Boolean,
37+
val javascriptConfigGoogleTakeout: String,
38+
)
39+
40+
data class UrlMapping(
41+
val key: String,
42+
val url: String,
43+
)
44+
45+
@ContributesBinding(AppScope::class)
46+
class BookmarkImportConfigStoreImpl @Inject constructor(
47+
private val autofillFeature: AutofillFeature,
48+
private val dispatchers: DispatcherProvider,
49+
private val moshi: Moshi,
50+
) : BookmarkImportConfigStore {
51+
52+
private val jsonAdapter: JsonAdapter<ImportConfigJson> by lazy {
53+
moshi.adapter(ImportConfigJson::class.java)
54+
}
55+
56+
override suspend fun getConfig(): BookmarkImportSettings {
57+
return withContext(dispatchers.io()) {
58+
val config = autofillFeature.canImportBookmarksFromGoogleTakeout().getSettings()?.let {
59+
runCatching {
60+
jsonAdapter.fromJson(it)
61+
}.getOrNull()
62+
}
63+
64+
BookmarkImportSettings(
65+
canImportFromGoogleTakeout = autofillFeature.canImportBookmarksFromGoogleTakeout().isEnabled(),
66+
launchUrlGoogleTakeout = config?.launchUrl ?: LAUNCH_URL_DEFAULT,
67+
canInjectJavascript = config?.canInjectJavascript ?: CAN_INJECT_JAVASCRIPT_DEFAULT,
68+
javascriptConfigGoogleTakeout = config?.javascriptConfig?.toString() ?: JAVASCRIPT_CONFIG_DEFAULT,
69+
)
70+
}
71+
}
72+
73+
companion object {
74+
internal const val JAVASCRIPT_CONFIG_DEFAULT = "\"{}\""
75+
internal const val CAN_INJECT_JAVASCRIPT_DEFAULT = true
76+
77+
internal const val LAUNCH_URL_DEFAULT = "https://takeout.google.com/settings/takeout"
78+
}
79+
80+
private data class ImportConfigJson(
81+
val launchUrl: String? = null,
82+
val canInjectJavascript: Boolean = CAN_INJECT_JAVASCRIPT_DEFAULT,
83+
val javascriptConfig: JSONObject? = null,
84+
)
85+
}

‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/importing/takeout/processor/TakeoutBookmarkImporter.kt‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright (c) 2025 DuckDuckGo
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.duckduckgo.autofill.impl.importing.takeout.processor
18+
19+
import android.net.Uri
20+
import com.duckduckgo.common.utils.DispatcherProvider
21+
import com.duckduckgo.di.scopes.AppScope
22+
import com.duckduckgo.savedsites.api.service.ImportSavedSitesResult
23+
import com.duckduckgo.savedsites.api.service.SavedSitesImporter
24+
import com.duckduckgo.savedsites.api.service.SavedSitesImporter.ImportFolder
25+
import com.squareup.anvil.annotations.ContributesBinding
26+
import java.io.File
27+
import javax.inject.Inject
28+
import kotlinx.coroutines.withContext
29+
30+
/**
31+
* Interface for importing bookmarks with flexible destination handling.
32+
* Supports both root-level imports and folder-based imports while preserving structure.
33+
*/
34+
interface TakeoutBookmarkImporter {
35+
36+
/**
37+
* Imports bookmarks from HTML content to the specified destination.
38+
* @param htmlContent The HTML bookmark content to import (in Netscape format)
39+
* @param destination Where to import the bookmarks (Root or named Folder within bookmarks root)
40+
* @return ImportSavedSitesResult indicating success with imported items or error
41+
*/
42+
suspend fun importBookmarks(htmlContent: String, destination: ImportFolder): ImportSavedSitesResult
43+
}
44+
45+
@ContributesBinding(AppScope::class)
46+
class RealTakeoutBookmarkImporter @Inject constructor(
47+
private val savedSitesImporter: SavedSitesImporter,
48+
private val dispatchers: DispatcherProvider,
49+
) : TakeoutBookmarkImporter {
50+
51+
override suspend fun importBookmarks(htmlContent: String, destination: ImportFolder): ImportSavedSitesResult {
52+
return withContext(dispatchers.io()) {
53+
import(htmlContent = htmlContent, destination = destination)
54+
}
55+
}
56+
57+
private suspend fun import(htmlContent: String, destination: ImportFolder = ImportFolder.Root): ImportSavedSitesResult {
58+
return try {
59+
// saved sites importer needs a file uri, so we create a temp file here
60+
val tempFile = File.createTempFile("bookmark_import_", ".html")
61+
try {
62+
tempFile.writeText(htmlContent)
63+
return savedSitesImporter.import(Uri.fromFile(tempFile), destination)
64+
} finally {
65+
// delete the temp file after import
66+
tempFile.takeIf { it.exists() }?.delete()
67+
}
68+
} catch (exception: Exception) {
69+
ImportSavedSitesResult.Error(exception)
70+
}
71+
}
72+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import kotlinx.parcelize.Parcelize
2222
sealed interface ImportGoogleBookmarkResult : Parcelable {
2323

2424
@Parcelize
25-
data object Success : ImportGoogleBookmarkResult
25+
data class Success(val importedCount: Int) : ImportGoogleBookmarkResult
2626

2727
@Parcelize
2828
data class UserCancelled(val stage: String) : ImportGoogleBookmarkResult

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

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)