Move WebStorageProvider to app module

Author: 0nko

…o/browsermode/impl/WebStorageProvider.kt …o/app/browser/mode/WebStorageProvider.ktbrowser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/WebStorageProvider.kt renamed to app/src/main/java/com/duckduckgo/app/browser/mode/WebStorageProvider.kt browser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/WebStorageProvider.kt renamed to app/src/main/java/com/duckduckgo/app/browser/mode/WebStorageProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.browsermode.impl
+package com.duckduckgo.app.browser.mode
 
 import android.annotation.SuppressLint
 import android.webkit.WebStorage
@@ -23,18 +23,35 @@ import androidx.webkit.ProfileStore
 import com.duckduckgo.browsermode.api.BrowserMode
 import com.duckduckgo.browsermode.api.BrowserModeDataProvider
 import com.duckduckgo.browsermode.api.FireModeAvailability
+import com.duckduckgo.browsermode.api.profileName
 import com.duckduckgo.di.scopes.AppScope
+import com.squareup.anvil.annotations.ContributesTo
+import dagger.Binds
+import dagger.Module
 import dagger.SingleInstanceIn
 import javax.inject.Inject
 
+/**
+ * Resolves a per-mode [WebStorage]. Callers must invoke [forMode] on the main thread when
+ * `MULTI_PROFILE` is supported on the device — `ProfileStore` is tied to the WebView thread.
+ * Falls back to the default shared [WebStorage] when MultiProfile is unsupported.
+ */
 @SuppressLint("RequiresFeature")
 @SingleInstanceIn(AppScope::class)
 class WebStorageProvider @Inject constructor(
     private val fireModeAvailability: FireModeAvailability,
 ) : BrowserModeDataProvider<WebStorage> {
+
     @UiThread
     override fun forMode(mode: BrowserMode): WebStorage {
         if (!fireModeAvailability.isAvailable()) return WebStorage.getInstance()
         return ProfileStore.getInstance().getOrCreateProfile(mode.profileName).webStorage
     }
 }
+
+@ContributesTo(AppScope::class)
+@Module
+abstract class WebStorageProviderModule {
+    @Binds
+    abstract fun bindWebStorageProvider(impl: WebStorageProvider): BrowserModeDataProvider<WebStorage>
+}

…owsermode/impl/WebStorageProviderTest.kt …p/browser/mode/WebStorageProviderTest.ktbrowser-mode/browser-mode-impl/src/test/kotlin/com/duckduckgo/browsermode/impl/WebStorageProviderTest.kt renamed to app/src/test/java/com/duckduckgo/app/browser/mode/WebStorageProviderTest.kt browser-mode/browser-mode-impl/src/test/kotlin/com/duckduckgo/browsermode/impl/WebStorageProviderTest.kt renamed to app/src/test/java/com/duckduckgo/app/browser/mode/WebStorageProviderTest.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.browsermode.impl
+package com.duckduckgo.app.browser.mode
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.duckduckgo.browsermode.api.BrowserMode
 import com.duckduckgo.browsermode.api.FireModeAvailability
-import junit.framework.TestCase.assertNotNull
+import org.junit.Assert.assertNotNull
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock

…owsermode/impl/BrowserModeProfileName.kt …rowsermode/api/BrowserModeProfileName.ktbrowser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/BrowserModeProfileName.kt renamed to browser-mode/browser-mode-api/src/main/java/com/duckduckgo/browsermode/api/BrowserModeProfileName.kt browser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/BrowserModeProfileName.kt renamed to browser-mode/browser-mode-api/src/main/java/com/duckduckgo/browsermode/api/BrowserModeProfileName.kt

@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.browsermode.impl
+package com.duckduckgo.browsermode.api
 
 import androidx.webkit.Profile
-import com.duckduckgo.browsermode.api.BrowserMode
 
-internal val BrowserMode.profileName: String
+/**
+ * Stable mapping from a [BrowserMode] to its WebView profile name.
+ *
+ * [REGULAR][BrowserMode.REGULAR] shares the default WebView profile;
+ * [FIRE][BrowserMode.FIRE] gets its own isolated profile.
+ */
+val BrowserMode.profileName: String
     get() = when (this) {
         BrowserMode.REGULAR -> Profile.DEFAULT_PROFILE_NAME
         BrowserMode.FIRE -> "Fire"

browser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/BrowserModeModule.kt

@@ -51,7 +51,7 @@ class RealFireModeAvailability @Inject constructor(
     private fun computeAndCache(): Boolean {
         cachedAvailability?.let { return it }
         val value = WebViewFeature.isFeatureSupported(WebViewFeature.MULTI_PROFILE) &&
-                fireModeFeature.fireTabs().isEnabled()
+            fireModeFeature.fireTabs().isEnabled()
         cachedAvailability = value
         return value
     }

browser-mode/browser-mode-impl/src/main/java/com/duckduckgo/browsermode/impl/RealFireModeAvailability.kt

@@ -23,6 +23,7 @@ import androidx.webkit.WebViewCompat
 import com.duckduckgo.browsermode.api.BrowserMode
 import com.duckduckgo.browsermode.api.FireModeAvailability
 import com.duckduckgo.browsermode.api.WebViewProfileBinder
+import com.duckduckgo.browsermode.api.profileName
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
 import dagger.SingleInstanceIn