Remove allowMainThreadQueries and update DAO functions

app/src/androidTest/java/org/wikipedia/database/UpgradeFromPreRoomTest.kt

@@ -4,7 +4,6 @@ import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.nullValue
@@ -123,7 +122,7 @@ class UpgradeFromPreRoomTest(private val fromVersion: Int) {
         val historyEntry = historyDao.findEntryBy("ru.wikipedia.org", "ru", "Обама,_Барак")!!
         assertThat(historyEntry.displayTitle, equalTo("Обама, Барак"))
 
-        val talkPageSeen = talkPageSeenDao.getAll().first()
+        val talkPageSeen = talkPageSeenDao.getAll()
         if (fromVersion == 22) {
             assertThat(talkPageSeen.count(), equalTo(2))
             assertThat(offlineObjectDao.getOfflineObject("https://en.wikipedia.org/api/rest_v1/page/summary/Joe_Biden")!!.path, equalTo("/data/user/0/org.wikipedia.dev/files/offline_files/481b1ef996728fd9994bd97ab19733d8"))

app/src/main/java/org/wikipedia/database/AppDatabase.kt

@@ -354,7 +354,6 @@ abstract class AppDatabase : RoomDatabase() {
                     MIGRATION_23_24, MIGRATION_24_25, MIGRATION_25_26, MIGRATION_26_27,
                     MIGRATION_26_28, MIGRATION_27_28, MIGRATION_28_29, MIGRATION_29_30,
                     MIGRATION_30_31)
-                .allowMainThreadQueries() // TODO: remove after resolving main thread issues in DAO classes
                 .fallbackToDestructiveMigration(false)
                 .build()
         }

app/src/main/java/org/wikipedia/dataclient/okhttp/OfflineCacheInterceptor.kt

@@ -1,17 +1,35 @@
 package org.wikipedia.dataclient.okhttp
 
-import okhttp3.*
+import kotlinx.coroutines.runBlocking
+import okhttp3.Interceptor
+import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okio.*
+import okhttp3.Protocol
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody
+import okio.Buffer
+import okio.BufferedSink
+import okio.BufferedSource
+import okio.Source
+import okio.Timeout
+import okio.buffer
+import okio.sink
+import okio.source
+import okio.use
 import org.wikipedia.WikipediaApp
 import org.wikipedia.database.AppDatabase
 import org.wikipedia.offline.db.OfflineObject
 import org.wikipedia.util.StringUtil
 import org.wikipedia.util.UriUtil
 import org.wikipedia.util.log.L
-import java.io.*
+import java.io.BufferedReader
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
 import java.io.IOException
-import java.util.*
+import java.io.InputStreamReader
+import java.io.OutputStreamWriter
 
 class OfflineCacheInterceptor : Interceptor {
 
@@ -49,7 +67,9 @@ class OfflineCacheInterceptor : Interceptor {
                 throw networkException
             }
         }
-        val obj = AppDatabase.instance.offlineObjectDao().findObject(url, lang)
+        val obj = runBlocking {
+            AppDatabase.instance.offlineObjectDao().findObject(url, lang)
+        }
         if (obj == null) {
             L.w("Offline object not present in database.")
             throw networkException
@@ -139,8 +159,8 @@ class OfflineCacheInterceptor : Interceptor {
         } ?: response
     }
 
-    private inner class CacheWritingSource constructor(private val source: BufferedSource, private val cacheSink: BufferedSink,
-                                                       private val obj: OfflineObject, private val title: String) : Source {
+    private inner class CacheWritingSource(private val source: BufferedSource, private val cacheSink: BufferedSink,
+                                           private val obj: OfflineObject, private val title: String) : Source {
         private var cacheRequestClosed = false
         private var failed = false
 
@@ -163,8 +183,9 @@ class OfflineCacheInterceptor : Interceptor {
                     // The cache response is complete!
                     cacheSink.close()
                     if (!failed) {
-                        // update the record in the database!
-                        AppDatabase.instance.offlineObjectDao().addObject(obj.url, obj.lang, obj.path, title)
+                        runBlocking {
+                            AppDatabase.instance.offlineObjectDao().addObject(obj.url, obj.lang, obj.path, title)
+                        }
                     }
                 }
                 return -1
@@ -192,9 +213,9 @@ class OfflineCacheInterceptor : Interceptor {
         }
     }
 
-    private inner class CacheWritingResponseBody constructor(private val source: Source,
-                                                             private val contentType: String?,
-                                                             private val contentLength: Long) : ResponseBody() {
+    private inner class CacheWritingResponseBody(private val source: Source,
+                                                 private val contentType: String?,
+                                                 private val contentLength: Long) : ResponseBody() {
         override fun contentType(): MediaType? {
             return contentType?.toMediaTypeOrNull()
         }
@@ -208,8 +229,8 @@ class OfflineCacheInterceptor : Interceptor {
         }
     }
 
-    private inner class CachedResponseBody constructor(private val file: File,
-                                                       private val contentType: String?) : ResponseBody() {
+    private inner class CachedResponseBody(private val file: File,
+                                           private val contentType: String?) : ResponseBody() {
         override fun contentType(): MediaType? {
             return contentType?.toMediaTypeOrNull()
         }

app/src/main/java/org/wikipedia/offline/db/OfflineObjectDao.kt

@@ -5,6 +5,7 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Transaction
 import androidx.room.Update
 import org.wikipedia.database.AppDatabase
 import org.wikipedia.dataclient.WikiSite
@@ -15,33 +16,31 @@ import java.io.File
 @Dao
 interface OfflineObjectDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertOfflineObject(obj: OfflineObject)
+    suspend fun insertOfflineObject(obj: OfflineObject)
 
     @Update(onConflict = OnConflictStrategy.REPLACE)
-    fun updateOfflineObject(obj: OfflineObject)
+    suspend fun updateOfflineObject(obj: OfflineObject)
 
     @Query("SELECT * FROM OfflineObject WHERE url = :url AND lang = :lang LIMIT 1")
-    fun getOfflineObject(url: String, lang: String): OfflineObject?
+    suspend fun getOfflineObject(url: String, lang: String): OfflineObject?
 
     @Query("SELECT * FROM OfflineObject WHERE url = :url LIMIT 1")
-    fun getOfflineObject(url: String): OfflineObject?
+    suspend fun getOfflineObject(url: String): OfflineObject?
 
     @Query("SELECT * FROM OfflineObject WHERE url LIKE '%/' || :urlFragment || '/%' LIMIT 1")
-    fun searchForOfflineObject(urlFragment: String): OfflineObject?
+    suspend fun searchForOfflineObject(urlFragment: String): OfflineObject?
 
     @Query("SELECT * FROM OfflineObject WHERE url LIKE '%' || :urlFragment || '%'")
-    fun searchForOfflineObjects(urlFragment: String): List<OfflineObject>
+    suspend fun searchForOfflineObjects(urlFragment: String): List<OfflineObject>
 
     @Query("SELECT * FROM OfflineObject WHERE usedByStr LIKE '%|' || :id || '|%'")
-    fun getFromUsedById(id: Long): List<OfflineObject>
+    suspend fun getFromUsedById(id: Long): List<OfflineObject>
 
     @Delete
-    fun deleteOfflineObject(obj: OfflineObject)
+    suspend fun deleteOfflineObject(obj: OfflineObject)
 
-    @Query("DELETE FROM OfflineObject")
-    fun deleteAll()
-
-    fun findObject(url: String, lang: String?): OfflineObject? {
+    @Transaction
+    suspend fun findObject(url: String, lang: String?): OfflineObject? {
         var obj = if (lang.isNullOrEmpty()) getOfflineObject(url) else getOfflineObject(url, lang)
 
         // Couldn't find an exact match, so...
@@ -56,7 +55,8 @@ interface OfflineObjectDao {
         return obj
     }
 
-    fun addObject(url: String, lang: String, path: String, pageTitle: String) {
+    @Transaction
+    suspend fun addObject(url: String, lang: String, path: String, pageTitle: String) {
         // first find this item if it already exists in the db
         var obj = getOfflineObject(url, lang)
 
@@ -88,7 +88,8 @@ interface OfflineObjectDao {
         }
     }
 
-    fun deleteObjectsForPageId(ids: List<Long>) {
+    @Transaction
+    suspend fun deleteObjectsForPageId(ids: List<Long>) {
         ids.forEach { id ->
             getFromUsedById(id).forEach { obj ->
                 if (obj.usedBy.contains(id)) {
@@ -105,7 +106,7 @@ interface OfflineObjectDao {
         }
     }
 
-    fun getTotalBytesForPageId(id: Long): Long {
+    suspend fun getTotalBytesForPageId(id: Long): Long {
         var totalBytes: Long = 0
         try {
             totalBytes = getFromUsedById(id).sumOf { File("${it.path}.1").length() }

app/src/main/java/org/wikipedia/page/PageFragment.kt

@@ -908,7 +908,12 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
                     L.e(t)
                 }) {
                     if (!page.thumbUrl.equals(title.thumbUrl, true) || !page.description.equals(title.description, true)) {
-                        AppDatabase.instance.readingListPageDao().updateMetadataByTitle(page, title.description, title.thumbUrl)
+                        AppDatabase.instance.readingListPageDao().updateThumbAndDescriptionByName(
+                            lang = page.wiki.languageCode,
+                            apiTitle = page.apiTitle,
+                            thumbUrl = title.thumbUrl,
+                            description = title.description
+                        )
                     }
                 }
             }
@@ -1048,13 +1053,11 @@ class PageFragment : Fragment(), BackPressedHandler, CommunicationBridge.Communi
         requireActivity().invalidateOptionsMenu()
     }
 
-    fun updateBookmarkAndMenuOptionsFromDao() {
+    suspend fun updateBookmarkAndMenuOptionsFromDao() {
         title?.let {
-            lifecycleScope.launch {
-                model.readingListPage = AppDatabase.instance.readingListPageDao().findPageInAnyList(it)
-                updateQuickActionsAndMenuOptions()
-                requireActivity().invalidateOptionsMenu()
-            }
+            model.readingListPage = AppDatabase.instance.readingListPageDao().findPageInAnyList(it)
+            updateQuickActionsAndMenuOptions()
+            requireActivity().invalidateOptionsMenu()
         }
     }
 

app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.kt

@@ -115,7 +115,11 @@ open class AddToReadingListDialog : ExtendedBottomSheetDialogFragment() {
     private fun showCreateListDialog() {
         readingListTitleDialog(requireActivity(), "", "", readingLists.map { it.title }, callback = object : ReadingListTitleDialog.Callback {
             override fun onSuccess(text: String, description: String) {
-                addAndDismiss(AppDatabase.instance.readingListDao().createList(text, description), titles)
+                lifecycleScope.launch(CoroutineExceptionHandler { _, throwable ->
+                    L.e(throwable)
+                }) {
+                    addAndDismiss(AppDatabase.instance.readingListDao().createList(text, description), titles)
+                }
             }
         }).show()
     }