Fix failing privacy tests (#5010)

CrisBarreiro · joshliebe · commit ab3f4e2a0c89 · 2024-09-13T20:01:53.000+01:00
Task/Issue URL: https://app.asana.com/0/1202552961248957/1208263793923549/f ### Description ### Steps to test this PR _Feature 1_ - [ ] - [ ] ### UI changes | Before | After | | ------ | ----- | !(Upload before screenshot)|(Upload after screenshot)|
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -4828,7 +4828,7 @@ class BrowserTabViewModelTest {
             "webShare",
             "myId",
             JSONObject("""{ "my":"object"}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.WebShareRequest> {
             assertEquals("object", this.data.params.getString("my"))
@@ -4848,7 +4848,7 @@ class BrowserTabViewModelTest {
             "permissionsQuery",
             "myId",
             JSONObject("""{ "name":"somePermission"}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToJs> {
             assertEquals("granted", this.data.params.getString("state"))
@@ -4866,7 +4866,7 @@ class BrowserTabViewModelTest {
             "screenLock",
             "myId",
             JSONObject("""{ "my":"object"}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandNotIssued<Command.ScreenLock>()
     }
@@ -4879,7 +4879,7 @@ class BrowserTabViewModelTest {
             "screenLock",
             "myId",
             JSONObject("""{ "my":"object"}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.ScreenLock> {
             assertEquals("object", this.data.params.getString("my"))
@@ -4897,7 +4897,7 @@ class BrowserTabViewModelTest {
             "screenUnlock",
             "myId",
             JSONObject("""{ "my":"object"}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandNotIssued<Command.ScreenUnlock>()
     }
@@ -4910,7 +4910,7 @@ class BrowserTabViewModelTest {
             "screenUnlock",
             "myId",
             JSONObject("""{ "my":"object"}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.ScreenUnlock>()
     }
@@ -4924,7 +4924,7 @@ class BrowserTabViewModelTest {
             "getUserValues",
             "id",
             data = null,
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToJs>()
     }
@@ -4938,7 +4938,7 @@ class BrowserTabViewModelTest {
             "setUserValues",
             "id",
             JSONObject("""{ overlayInteracted: "true", privatePlayerMode: {disabled: {} }}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToJs>()
         verify(mockDuckPlayer).setUserPreferences(any(), any())
@@ -4954,7 +4954,7 @@ class BrowserTabViewModelTest {
             "setUserValues",
             "id",
             JSONObject("""{ overlayInteracted: "true", privatePlayerMode: {enabled: {} }}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToJs>()
         verify(mockDuckPlayer).setUserPreferences(any(), any())
@@ -4970,7 +4970,7 @@ class BrowserTabViewModelTest {
             "setUserValues",
             "id",
             JSONObject("""{ overlayInteracted: "true", privatePlayerMode: {enabled: {} }}"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToDuckPlayer>()
         verify(mockDuckPlayer).setUserPreferences(true, "enabled")
@@ -4986,7 +4986,7 @@ class BrowserTabViewModelTest {
             "sendDuckPlayerPixel",
             "id",
             JSONObject("""{ pixelName: "pixel", params: {}}"""),
-            "someUrl",
+            { "someUrl" },
         )
         verify(mockDuckPlayer).sendDuckPlayerPixel("pixel", mapOf())
     }
@@ -5000,7 +5000,7 @@ class BrowserTabViewModelTest {
             "openDuckPlayer",
             "id",
             JSONObject("""{ href: "duck://player/1234" }"""),
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Navigate>()
     }
@@ -5014,7 +5014,7 @@ class BrowserTabViewModelTest {
             "openDuckPlayer",
             "id",
             null,
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandNotIssued<Navigate>()
     }
@@ -5028,7 +5028,7 @@ class BrowserTabViewModelTest {
             "initialSetup",
             "id",
             null,
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToJs>()
     }
@@ -5042,7 +5042,7 @@ class BrowserTabViewModelTest {
             "initialSetup",
             "id",
             null,
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.SendResponseToDuckPlayer>()
     }
@@ -5055,7 +5055,7 @@ class BrowserTabViewModelTest {
             "openSettings",
             "id",
             null,
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.OpenDuckPlayerSettings>()
     }
@@ -5070,7 +5070,7 @@ class BrowserTabViewModelTest {
             "openInfo",
             "id",
             null,
-            "someUrl",
+            { "someUrl" },
         )
         assertCommandIssued<Command.OpenDuckPlayerPageInfo>()
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -2429,7 +2429,9 @@ class BrowserTabFragment :
                         id: String?,
                         data: JSONObject?,
                     ) {
-                        viewModel.processJsCallbackMessage(featureName, method, id, data, it.url)
+                        viewModel.processJsCallbackMessage(featureName, method, id, data) {
+                            it.url
+                        }
                     }
                 },
             )
@@ -2442,7 +2444,9 @@ class BrowserTabFragment :
                         id: String?,
                         data: JSONObject?,
                     ) {
-                        viewModel.processJsCallbackMessage(featureName, method, id, data, it.url)
+                        viewModel.processJsCallbackMessage(featureName, method, id, data) {
+                            it.url
+                        }
                     }
                 },
             )
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -3172,7 +3172,7 @@ class BrowserTabViewModel @Inject constructor(
         method: String,
         id: String?,
         data: JSONObject?,
-        url: String?,
+        getWebViewUrl: () -> String?,
     ) {
         when (method) {
             "webShare" -> if (id != null && data != null) {
@@ -3201,7 +3201,8 @@ class BrowserTabViewModel @Inject constructor(
         when (featureName) {
             DUCK_PLAYER_FEATURE_NAME, DUCK_PLAYER_PAGE_FEATURE_NAME -> {
                 viewModelScope.launch(dispatchers.io()) {
-                    val response = duckPlayerJSHelper.processJsCallbackMessage(featureName, method, id, data, url)
+                    val webViewUrl = withContext(dispatchers.main()) { getWebViewUrl() }
+                    val response = duckPlayerJSHelper.processJsCallbackMessage(featureName, method, id, data, webViewUrl)
                     withContext(dispatchers.main()) {
                         response?.let {
                             command.value = it
diff --git a/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerDataStore.kt b/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerDataStore.kt
@@ -116,7 +116,7 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(
     private val duckPlayerRC: Flow<String>
         get() = store.data
             .map { prefs ->
-                prefs[DUCK_PLAYER_RC] ?: ""
+                prefs[DUCK_PLAYER_RC] ?: "{}"
             }
             .distinctUntilChanged()
 
diff --git a/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerFeatureRepository.kt b/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerFeatureRepository.kt
@@ -17,13 +17,15 @@
 package com.duckduckgo.duckplayer.impl
 
 import com.duckduckgo.app.di.AppCoroutineScope
+import com.duckduckgo.app.di.IsMainProcess
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.duckplayer.api.DuckPlayer.UserPreferences
 import com.duckduckgo.duckplayer.api.PrivatePlayerMode.AlwaysAsk
 import com.duckduckgo.duckplayer.api.PrivatePlayerMode.Disabled
 import com.duckduckgo.duckplayer.api.PrivatePlayerMode.Enabled
 import com.squareup.anvil.annotations.ContributesBinding
+import dagger.SingleInstanceIn
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -68,17 +70,21 @@ interface DuckPlayerFeatureRepository {
     suspend fun setUserOnboarded()
 }
 
+@SingleInstanceIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class RealDuckPlayerFeatureRepository @Inject constructor(
     private val duckPlayerDataStore: DuckPlayerDataStore,
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
     private val dispatcherProvider: DispatcherProvider,
+    @IsMainProcess isMainProcess: Boolean,
 ) : DuckPlayerFeatureRepository {
 
-    private var duckPlayerRC = ""
+    private var duckPlayerRC = "{}"
 
     init {
-        loadToMemory()
+        if (isMainProcess) {
+            loadToMemory()
+        }
     }
 
     private fun loadToMemory() {

Original file line number	Diff line number	Diff line change
`@@ -4828,7 +4828,7 @@ class BrowserTabViewModelTest {`
`4828`	`4828`	`"webShare",`
`4829`	`4829`	`"myId",`
`4830`	`4830`	`JSONObject("""{ "my":"object"}"""),`
`4831`		`- "someUrl",`
	`4831`	`+ { "someUrl" },`
`4832`	`4832`	`)`
`4833`	`4833`	`assertCommandIssued<Command.WebShareRequest> {`
`4834`	`4834`	`assertEquals("object", this.data.params.getString("my"))`
`@@ -4848,7 +4848,7 @@ class BrowserTabViewModelTest {`
`4848`	`4848`	`"permissionsQuery",`
`4849`	`4849`	`"myId",`
`4850`	`4850`	`JSONObject("""{ "name":"somePermission"}"""),`
`4851`		`- "someUrl",`
	`4851`	`+ { "someUrl" },`
`4852`	`4852`	`)`
`4853`	`4853`	`assertCommandIssued<Command.SendResponseToJs> {`
`4854`	`4854`	`assertEquals("granted", this.data.params.getString("state"))`
`@@ -4866,7 +4866,7 @@ class BrowserTabViewModelTest {`
`4866`	`4866`	`"screenLock",`
`4867`	`4867`	`"myId",`
`4868`	`4868`	`JSONObject("""{ "my":"object"}"""),`
`4869`		`- "someUrl",`
	`4869`	`+ { "someUrl" },`
`4870`	`4870`	`)`
`4871`	`4871`	`assertCommandNotIssued<Command.ScreenLock>()`
`4872`	`4872`	`}`
`@@ -4879,7 +4879,7 @@ class BrowserTabViewModelTest {`
`4879`	`4879`	`"screenLock",`
`4880`	`4880`	`"myId",`
`4881`	`4881`	`JSONObject("""{ "my":"object"}"""),`
`4882`		`- "someUrl",`
	`4882`	`+ { "someUrl" },`
`4883`	`4883`	`)`
`4884`	`4884`	`assertCommandIssued<Command.ScreenLock> {`
`4885`	`4885`	`assertEquals("object", this.data.params.getString("my"))`
`@@ -4897,7 +4897,7 @@ class BrowserTabViewModelTest {`
`4897`	`4897`	`"screenUnlock",`
`4898`	`4898`	`"myId",`
`4899`	`4899`	`JSONObject("""{ "my":"object"}"""),`
`4900`		`- "someUrl",`
	`4900`	`+ { "someUrl" },`
`4901`	`4901`	`)`
`4902`	`4902`	`assertCommandNotIssued<Command.ScreenUnlock>()`
`4903`	`4903`	`}`
`@@ -4910,7 +4910,7 @@ class BrowserTabViewModelTest {`
`4910`	`4910`	`"screenUnlock",`
`4911`	`4911`	`"myId",`
`4912`	`4912`	`JSONObject("""{ "my":"object"}"""),`
`4913`		`- "someUrl",`
	`4913`	`+ { "someUrl" },`
`4914`	`4914`	`)`
`4915`	`4915`	`assertCommandIssued<Command.ScreenUnlock>()`
`4916`	`4916`	`}`
`@@ -4924,7 +4924,7 @@ class BrowserTabViewModelTest {`
`4924`	`4924`	`"getUserValues",`
`4925`	`4925`	`"id",`
`4926`	`4926`	`data = null,`
`4927`		`- "someUrl",`
	`4927`	`+ { "someUrl" },`
`4928`	`4928`	`)`
`4929`	`4929`	`assertCommandIssued<Command.SendResponseToJs>()`
`4930`	`4930`	`}`
`@@ -4938,7 +4938,7 @@ class BrowserTabViewModelTest {`
`4938`	`4938`	`"setUserValues",`
`4939`	`4939`	`"id",`
`4940`	`4940`	`JSONObject("""{ overlayInteracted: "true", privatePlayerMode: {disabled: {} }}"""),`
`4941`		`- "someUrl",`
	`4941`	`+ { "someUrl" },`
`4942`	`4942`	`)`
`4943`	`4943`	`assertCommandIssued<Command.SendResponseToJs>()`
`4944`	`4944`	`verify(mockDuckPlayer).setUserPreferences(any(), any())`
`@@ -4954,7 +4954,7 @@ class BrowserTabViewModelTest {`
`4954`	`4954`	`"setUserValues",`
`4955`	`4955`	`"id",`
`4956`	`4956`	`JSONObject("""{ overlayInteracted: "true", privatePlayerMode: {enabled: {} }}"""),`
`4957`		`- "someUrl",`
	`4957`	`+ { "someUrl" },`
`4958`	`4958`	`)`
`4959`	`4959`	`assertCommandIssued<Command.SendResponseToJs>()`
`4960`	`4960`	`verify(mockDuckPlayer).setUserPreferences(any(), any())`
`@@ -4970,7 +4970,7 @@ class BrowserTabViewModelTest {`
`4970`	`4970`	`"setUserValues",`
`4971`	`4971`	`"id",`
`4972`	`4972`	`JSONObject("""{ overlayInteracted: "true", privatePlayerMode: {enabled: {} }}"""),`
`4973`		`- "someUrl",`
	`4973`	`+ { "someUrl" },`
`4974`	`4974`	`)`
`4975`	`4975`	`assertCommandIssued<Command.SendResponseToDuckPlayer>()`
`4976`	`4976`	`verify(mockDuckPlayer).setUserPreferences(true, "enabled")`
`@@ -4986,7 +4986,7 @@ class BrowserTabViewModelTest {`
`4986`	`4986`	`"sendDuckPlayerPixel",`
`4987`	`4987`	`"id",`
`4988`	`4988`	`JSONObject("""{ pixelName: "pixel", params: {}}"""),`
`4989`		`- "someUrl",`
	`4989`	`+ { "someUrl" },`
`4990`	`4990`	`)`
`4991`	`4991`	`verify(mockDuckPlayer).sendDuckPlayerPixel("pixel", mapOf())`
`4992`	`4992`	`}`
`@@ -5000,7 +5000,7 @@ class BrowserTabViewModelTest {`
`5000`	`5000`	`"openDuckPlayer",`
`5001`	`5001`	`"id",`
`5002`	`5002`	`JSONObject("""{ href: "duck://player/1234" }"""),`
`5003`		`- "someUrl",`
	`5003`	`+ { "someUrl" },`
`5004`	`5004`	`)`
`5005`	`5005`	`assertCommandIssued<Navigate>()`
`5006`	`5006`	`}`
`@@ -5014,7 +5014,7 @@ class BrowserTabViewModelTest {`
`5014`	`5014`	`"openDuckPlayer",`
`5015`	`5015`	`"id",`
`5016`	`5016`	`null,`
`5017`		`- "someUrl",`
	`5017`	`+ { "someUrl" },`
`5018`	`5018`	`)`
`5019`	`5019`	`assertCommandNotIssued<Navigate>()`
`5020`	`5020`	`}`
`@@ -5028,7 +5028,7 @@ class BrowserTabViewModelTest {`
`5028`	`5028`	`"initialSetup",`
`5029`	`5029`	`"id",`
`5030`	`5030`	`null,`
`5031`		`- "someUrl",`
	`5031`	`+ { "someUrl" },`
`5032`	`5032`	`)`
`5033`	`5033`	`assertCommandIssued<Command.SendResponseToJs>()`
`5034`	`5034`	`}`
`@@ -5042,7 +5042,7 @@ class BrowserTabViewModelTest {`
`5042`	`5042`	`"initialSetup",`
`5043`	`5043`	`"id",`
`5044`	`5044`	`null,`
`5045`		`- "someUrl",`
	`5045`	`+ { "someUrl" },`
`5046`	`5046`	`)`
`5047`	`5047`	`assertCommandIssued<Command.SendResponseToDuckPlayer>()`
`5048`	`5048`	`}`
`@@ -5055,7 +5055,7 @@ class BrowserTabViewModelTest {`
`5055`	`5055`	`"openSettings",`
`5056`	`5056`	`"id",`
`5057`	`5057`	`null,`
`5058`		`- "someUrl",`
	`5058`	`+ { "someUrl" },`
`5059`	`5059`	`)`
`5060`	`5060`	`assertCommandIssued<Command.OpenDuckPlayerSettings>()`
`5061`	`5061`	`}`
`@@ -5070,7 +5070,7 @@ class BrowserTabViewModelTest {`
`5070`	`5070`	`"openInfo",`
`5071`	`5071`	`"id",`
`5072`	`5072`	`null,`
`5073`		`- "someUrl",`
	`5073`	`+ { "someUrl" },`
`5074`	`5074`	`)`
`5075`	`5075`	`assertCommandIssued<Command.OpenDuckPlayerPageInfo>()`
`5076`	`5076`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2429,7 +2429,9 @@ class BrowserTabFragment :`
`2429`	`2429`	`id: String?,`
`2430`	`2430`	`data: JSONObject?,`
`2431`	`2431`	`) {`
`2432`		`- viewModel.processJsCallbackMessage(featureName, method, id, data, it.url)`
	`2432`	`+ viewModel.processJsCallbackMessage(featureName, method, id, data) {`
	`2433`	`+ it.url`
	`2434`	`+ }`
`2433`	`2435`	`}`
`2434`	`2436`	`},`
`2435`	`2437`	`)`
`@@ -2442,7 +2444,9 @@ class BrowserTabFragment :`
`2442`	`2444`	`id: String?,`
`2443`	`2445`	`data: JSONObject?,`
`2444`	`2446`	`) {`
`2445`		`- viewModel.processJsCallbackMessage(featureName, method, id, data, it.url)`
	`2447`	`+ viewModel.processJsCallbackMessage(featureName, method, id, data) {`
	`2448`	`+ it.url`
	`2449`	`+ }`
`2446`	`2450`	`}`
`2447`	`2451`	`},`
`2448`	`2452`	`)`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(`
`116`	`116`	`private val duckPlayerRC: Flow<String>`
`117`	`117`	`get() = store.data`
`118`	`118`	`.map { prefs ->`
`119`		`- prefs[DUCK_PLAYER_RC] ?: ""`
	`119`	`+ prefs[DUCK_PLAYER_RC] ?: "{}"`
`120`	`120`	`}`
`121`	`121`	`.distinctUntilChanged()`
`122`	`122`