Improve performance of Link Preview when used in Places. (#4499)

* Improve performance of Link Preview when used in Places. * Also check if logged in.
wikimedia · Mar 1, 2024 · 065f7c0 · 065f7c0
1 parent 4799fa2
commit 065f7c0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewModel.kt b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewViewModel.kt
@@ -6,10 +6,12 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import org.wikipedia.analytics.eventplatform.WatchlistAnalyticsHelper
+import org.wikipedia.auth.AccountUtil
 import org.wikipedia.database.AppDatabase
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.extensions.parcelable
@@ -40,9 +42,12 @@ class LinkPreviewViewModel(bundle: Bundle) : ViewModel() {
         viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
             _uiState.value = LinkPreviewViewState.Error(throwable)
         }) {
-            val response = ServiceFactory.getRest(pageTitle.wikiSite)
-                .getSummaryResponseSuspend(pageTitle.prefixedText, null, null, null, null, null)
+            val summaryCall = async { ServiceFactory.getRest(pageTitle.wikiSite)
+                .getSummaryResponseSuspend(pageTitle.prefixedText, null, null, null, null, null) }
 
+            val watchedCall = async { if (fromPlaces && AccountUtil.isLoggedIn) ServiceFactory.get(pageTitle.wikiSite).getWatchedStatus(pageTitle.prefixedText) else null }
+
+            val response = summaryCall.await()
             val summary = response.body()!!
             // Rebuild our PageTitle, since it may have been redirected or normalized.
             val oldFragment = pageTitle.fragment
@@ -60,9 +65,7 @@ class LinkPreviewViewModel(bundle: Bundle) : ViewModel() {
             }
 
             if (fromPlaces) {
-                val watchStatus = ServiceFactory.get(pageTitle.wikiSite).getWatchedStatus(pageTitle.prefixedText).query?.firstPage()
-                isWatched = watchStatus?.watched ?: false
-
+                isWatched = watchedCall.await()?.query?.firstPage()?.watched ?: false
                 val readingList = AppDatabase.instance.readingListPageDao().findPageInAnyList(pageTitle)
                 isInReadingList = readingList != null
             }