Skip to content

Commit ec4a6bc

Browse files
authored
remove asynchronous call to fetch local depictedItems (commons-app#5792)
1 parent 39a0b88 commit ec4a6bc

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers
1616
import io.reactivex.disposables.CompositeDisposable
1717
import io.reactivex.processors.PublishProcessor
1818
import io.reactivex.schedulers.Schedulers
19-
import kotlinx.coroutines.CoroutineScope
20-
import kotlinx.coroutines.Dispatchers
21-
import kotlinx.coroutines.launch
19+
import kotlinx.coroutines.runBlocking
2220
import timber.log.Timber
2321
import java.lang.reflect.Proxy
24-
import java.util.*
2522
import javax.inject.Inject
2623
import javax.inject.Named
2724
import javax.inject.Singleton
@@ -88,7 +85,7 @@ class DepictsPresenter @Inject constructor(
8885
var recentDepictedItemList: MutableList<DepictedItem> = ArrayList();
8986
//show recentDepictedItemList when queryString is empty
9087
if (querystring.isEmpty()) {
91-
recentDepictedItemList = getRecentDepictedItems();
88+
recentDepictedItemList = getRecentDepictedItems().toMutableList()
9289
}
9390

9491
if (media == null) {
@@ -268,17 +265,9 @@ class DepictsPresenter @Inject constructor(
268265
/**
269266
* Get the depicts from DepictsRoomdataBase
270267
*/
271-
fun getRecentDepictedItems(): MutableList<DepictedItem> {
272-
val depictedItemList: MutableList<DepictedItem> = ArrayList()
273-
CoroutineScope(Dispatchers.IO).launch {
274-
val depictsList = depictsDao.depictsList().await()
275-
276-
for (i in depictsList.indices) {
277-
val depictedItem = depictsList[i].item
278-
depictedItemList.add(depictedItem)
279-
}
280-
}
281-
return depictedItemList
268+
private fun getRecentDepictedItems(): List<DepictedItem> = runBlocking {
269+
val depictsList = depictsDao.depictsList().await()
270+
return@runBlocking depictsList.map { it.item }
282271
}
283272
}
284273

0 commit comments

Comments
 (0)