diff --git a/app/src/main/java/org/wikipedia/feed/random/RandomClient.kt b/app/src/main/java/org/wikipedia/feed/random/RandomClient.kt index 0f01e024c34..28c499aa106 100644 --- a/app/src/main/java/org/wikipedia/feed/random/RandomClient.kt +++ b/app/src/main/java/org/wikipedia/feed/random/RandomClient.kt @@ -30,7 +30,6 @@ class RandomClient( cb.error(caught) } ) { - val list = mutableListOf() val deferredSummaries = WikipediaApp.instance.languageState.appLanguageCodes .filter { !FeedContentType.RANDOM.langCodesDisabled.contains(it) } .map { lang -> @@ -49,9 +48,7 @@ class RandomClient( } } - val randomCards = deferredSummaries.awaitAll().filterNotNull() - list.addAll(randomCards) - cb.success(list) + cb.success(deferredSummaries.awaitAll().filterNotNull()) } } diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.kt b/app/src/main/java/org/wikipedia/util/L10nUtil.kt index 5970dfae3f3..a75c8506337 100644 --- a/app/src/main/java/org/wikipedia/util/L10nUtil.kt +++ b/app/src/main/java/org/wikipedia/util/L10nUtil.kt @@ -7,7 +7,6 @@ import android.util.SparseArray import android.view.View import androidx.annotation.StringRes import androidx.core.os.ConfigurationCompat -import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -154,14 +153,12 @@ object L10nUtil { } // Third, update the extracts from the page/summary endpoint if needed. - val summaryForExtractsDeferred = mutableListOf>() if (shouldUpdateExtracts) { - summaryForExtractsDeferred.addAll(list.map { pageSummary -> + list.map { pageSummary -> async { ServiceFactory.getRest(wikiSite).getPageSummary(null, pageSummary.apiTitle) } - }) - summaryForExtractsDeferred.awaitAll().forEachIndexed { index, pageSummary -> + }.awaitAll().forEachIndexed { index, pageSummary -> list[index].extract = pageSummary.extract list[index].extractHtml = pageSummary.extractHtml }