From c612fceaceae911878224b6fee21bef0ba66df0e Mon Sep 17 00:00:00 2001 From: Cris Barreiro Date: Wed, 14 Aug 2024 11:14:40 +0200 Subject: [PATCH] Update initialSetup with allowFirstVideo --- .../browser/duckplayer/DuckPlayerJSHelper.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt b/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt index 25d460d8a3d7..0ea68b13254c 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt @@ -24,8 +24,6 @@ import com.duckduckgo.app.browser.commands.Command.SendResponseToJs import com.duckduckgo.app.browser.commands.NavigationCommand.Navigate import com.duckduckgo.appbuildconfig.api.AppBuildConfig import com.duckduckgo.duckplayer.api.DuckPlayer -import com.duckduckgo.duckplayer.api.PrivatePlayerMode.AlwaysAsk -import com.duckduckgo.duckplayer.api.PrivatePlayerMode.Disabled import com.duckduckgo.js.messaging.api.JsCallbackData import javax.inject.Inject import org.json.JSONObject @@ -61,14 +59,7 @@ class DuckPlayerJSHelper @Inject constructor( } private suspend fun getInitialSetup(featureName: String, method: String, id: String): JsCallbackData { - val userValues = duckPlayer.getUserPreferences().let { - if (it.privatePlayerMode == AlwaysAsk && duckPlayer.shouldHideDuckPlayerOverlay()) { - duckPlayer.duckPlayerOverlayHidden() - it.copy(overlayInteracted = false, privatePlayerMode = Disabled) - } else { - it - } - } + val userValues = duckPlayer.getUserPreferences() val jsonObject = JSONObject( """ @@ -83,10 +74,14 @@ class DuckPlayerJSHelper @Inject constructor( $PRIVATE_PLAYER_MODE: { "${userValues.privatePlayerMode.value}": {} } - } + }, + ui: { + "allowFirstVideo": ${duckPlayer.shouldHideDuckPlayerOverlay()} + } } """, ) + duckPlayer.duckPlayerOverlayHidden() if (featureName == DUCK_PLAYER_PAGE_FEATURE_NAME) { jsonObject.put("platform", JSONObject("""{ name: "android" }"""))