Cache datastore values using StateFlows to improve performance and ad…

…dress ANRs
duckduckgo · Oct 22, 2024 · 89679f7 · 89679f7
1 parent 1cec8c1
commit 89679f7
Show file tree

Hide file tree

Showing 7 changed files with 183 additions and 192 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt b/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt
@@ -34,7 +34,6 @@ import com.duckduckgo.privacy.config.api.TrackingParameters
 import com.duckduckgo.subscriptions.api.Subscriptions
 import java.net.URISyntaxException
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 
@@ -92,9 +91,7 @@ class SpecialUrlDetectorImpl(
 
         val uri = uriString.toUri()
 
-        val willNavigateToDuckPlayerDeferred = scope.async(dispatcherProvider.io()) { duckPlayer.willNavigateToDuckPlayer(uri) }
-
-        val willNavigateToDuckPlayer = runBlocking(dispatcherProvider.io()) { willNavigateToDuckPlayerDeferred.await() }
+        val willNavigateToDuckPlayer = runBlocking(dispatcherProvider.io()) { duckPlayer.willNavigateToDuckPlayer(uri) }
 
         if (willNavigateToDuckPlayer) {
             return UrlType.ShouldLaunchDuckPlayerLink(url = uri)

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
@@ -98,7 +98,7 @@ class DuckPlayerJSHelper @Inject constructor(
         }
     }
 
-    private suspend fun getInitialSetup(featureName: String, method: String, id: String): JsCallbackData {
+    private fun getInitialSetup(featureName: String, method: String, id: String): JsCallbackData {
         val userValues = duckPlayer.getUserPreferences()
         val privatePlayerMode = if (duckPlayer.getDuckPlayerState() == ENABLED) userValues.privatePlayerMode else PrivatePlayerMode.Disabled
 

diff --git a/duckplayer/duckplayer-api/src/main/java/com/duckduckgo/duckplayer/api/DuckPlayer.kt b/duckplayer/duckplayer-api/src/main/java/com/duckduckgo/duckplayer/api/DuckPlayer.kt
@@ -50,7 +50,7 @@ interface DuckPlayer {
      *
      * @return The current state of the DuckPlayer as a DuckPlayerState enum.
      */
-    suspend fun getDuckPlayerState(): DuckPlayerState
+    fun getDuckPlayerState(): DuckPlayerState
 
     /**
      * Sends a pixel with the given name and data.
@@ -65,7 +65,7 @@ interface DuckPlayer {
      *
      * @return The user values.
      */
-    suspend fun getUserPreferences(): UserPreferences
+    fun getUserPreferences(): UserPreferences
 
     /**
      * Checks if the DuckPlayer overlay should be hidden after navigating back from Duck Player
@@ -105,7 +105,7 @@ interface DuckPlayer {
      * @param uri The YouTube no-cookie URI.
      * @return The DuckPlayer URI.
      */
-    suspend fun createDuckPlayerUriFromYoutubeNoCookie(uri: Uri): String?
+    fun createDuckPlayerUriFromYoutubeNoCookie(uri: Uri): String?
 
     /**
      * Checks if a string is a DuckPlayer URI.
@@ -120,7 +120,7 @@ interface DuckPlayer {
      * @param uri The DuckPlayer URI.
      * @return The YouTube URI.
      */
-    suspend fun createYoutubeWatchUrlFromDuckPlayer(uri: Uri): String?
+    fun createYoutubeWatchUrlFromDuckPlayer(uri: Uri): String?
 
     /**
      * Checks if a URI is a simulated YouTube no-cookie URI.
@@ -136,7 +136,7 @@ interface DuckPlayer {
      * @param uri The URI to check.
      * @return True if the URI is a YouTube no-cookie URI, false otherwise.
      */
-    suspend fun isYoutubeWatchUrl(uri: Uri): Boolean
+    fun isYoutubeWatchUrl(uri: Uri): Boolean
 
     /**
      * Checks if a URI is a YouTube URL.
@@ -184,7 +184,7 @@ interface DuckPlayer {
         destinationUrl: Uri,
     ): Boolean
 
-    suspend fun shouldOpenDuckPlayerInNewTab(): OpenDuckPlayerInNewTab
+    fun shouldOpenDuckPlayerInNewTab(): OpenDuckPlayerInNewTab
 
     fun observeShouldOpenInNewTab(): Flow<OpenDuckPlayerInNewTab>