Remove allowMainThreadQueries and update DAO functions

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

@@ -5,10 +5,15 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.count
-import kotlinx.coroutines.flow.first
-import org.hamcrest.CoreMatchers.*
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.CoreMatchers.notNullValue
+import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.After
 import org.junit.Before
@@ -22,7 +27,7 @@ import org.wikipedia.search.db.RecentSearchDao
 import org.wikipedia.talk.db.TalkPageSeen
 import org.wikipedia.talk.db.TalkPageSeenDao
 import org.wikipedia.util.log.L
-import java.util.*
+import java.util.Date
 
 @RunWith(AndroidJUnit4::class)
 class AppDatabaseTests {
@@ -100,8 +105,8 @@ class AppDatabaseTests {
 
         notificationDao.insertNotifications(notifications)
 
-        var enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki")).first()
-        val zhWikiList = notificationDao.getNotificationsByWiki(listOf("zhwiki")).first()
+        var enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki"))
+        val zhWikiList = notificationDao.getNotificationsByWiki(listOf("zhwiki"))
         assertThat(enWikiList, notNullValue())
         assertThat(enWikiList.first().id, equalTo(123759827))
         assertThat(zhWikiList.first().id, equalTo(2470933))
@@ -114,18 +119,18 @@ class AppDatabaseTests {
         notificationDao.updateNotification(firstEnNotification)
 
         // get updated item
-        enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki")).first()
+        enWikiList = notificationDao.getNotificationsByWiki(listOf("enwiki"))
         assertThat(enWikiList.first().id, equalTo(123759827))
         assertThat(enWikiList.first().isUnread, equalTo(true))
 
         notificationDao.deleteNotification(firstEnNotification)
         assertThat(notificationDao.getAllNotifications().size, equalTo(2))
-        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).first().size, equalTo(1))
+        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).size, equalTo(1))
 
-        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("enwiki")).first().first())
-        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).first().isEmpty(), equalTo(true))
+        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("enwiki")).first())
+        assertThat(notificationDao.getNotificationsByWiki(listOf("enwiki")).isEmpty(), equalTo(true))
 
-        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("zhwiki")).first().first())
+        notificationDao.deleteNotification(notificationDao.getNotificationsByWiki(listOf("zhwiki")).first())
         assertThat(notificationDao.getAllNotifications().isEmpty(), equalTo(true))
     }
 }

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/WikipediaApp.kt

@@ -258,7 +258,9 @@ class WikipediaApp : Application() {
         Prefs.tempAccountCreateDay = 0L
         Prefs.tempAccountDialogShown = false
         SharedPreferenceCookieManager.instance.clearAllCookies()
-        AppDatabase.instance.notificationDao().deleteAll()
+        MainScope().launch {
+            AppDatabase.instance.notificationDao().deleteAll()
+        }
         FlowEventBus.post(LoggedOutEvent())
         L.d("Logout complete.")
     }

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/notifications/NotificationPollBroadcastReceiver.kt

@@ -9,7 +9,10 @@ import android.os.SystemClock
 import androidx.annotation.StringRes
 import androidx.core.app.PendingIntentCompat
 import androidx.core.app.RemoteInput
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wikipedia.Constants
 import org.wikipedia.R
@@ -146,26 +149,30 @@ class NotificationPollBroadcastReceiver : BroadcastReceiver() {
                 return
             }
 
-            // The notifications that we need to display are those that don't exist in our db yet.
-            val notificationsToDisplay = notifications.filter {
-                AppDatabase.instance.notificationDao().getNotificationById(it.wiki, it.id) == null
-            }
-            AppDatabase.instance.notificationDao().insertNotifications(notificationsToDisplay)
+            MainScope().launch(CoroutineExceptionHandler { _, throwable ->
+                L.w(throwable)
+            }) {
+                // The notifications that we need to display are those that don't exist in our db yet.
+                val notificationsToDisplay = notifications.filter {
+                    AppDatabase.instance.notificationDao().getNotificationById(it.wiki, it.id) == null
+                }
+                AppDatabase.instance.notificationDao().insertNotifications(notificationsToDisplay)
 
-            if (notificationsToDisplay.isNotEmpty()) {
-                Prefs.notificationUnreadCount = notificationsToDisplay.size
-                FlowEventBus.post(UnreadNotificationsEvent())
-            }
+                if (notificationsToDisplay.isNotEmpty()) {
+                    Prefs.notificationUnreadCount = notificationsToDisplay.size
+                    FlowEventBus.post(UnreadNotificationsEvent())
+                }
 
-            if (notificationsToDisplay.size > 2) {
-                // Record that there is an incoming notification to track/compare further actions on it.
-                NotificationPresenter.showMultipleUnread(context, notificationsToDisplay.size)
-            } else {
-                for (n in notificationsToDisplay) {
+                if (notificationsToDisplay.size > 2) {
                     // Record that there is an incoming notification to track/compare further actions on it.
-                    NotificationPresenter.showNotification(context, n,
-                        dbWikiNameMap.getOrElse(n.wiki) { n.wiki },
-                        dbWikiSiteMap.getValue(n.wiki).languageCode)
+                    NotificationPresenter.showMultipleUnread(context, notificationsToDisplay.size)
+                } else {
+                    for (n in notificationsToDisplay) {
+                        // Record that there is an incoming notification to track/compare further actions on it.
+                        NotificationPresenter.showNotification(context, n,
+                            dbWikiNameMap.getOrElse(n.wiki) { n.wiki },
+                            dbWikiSiteMap.getValue(n.wiki).languageCode)
+                    }
                 }
             }
         }

app/src/main/java/org/wikipedia/notifications/NotificationRepository.kt

@@ -8,11 +8,7 @@ import org.wikipedia.notifications.db.NotificationDao
 
 class NotificationRepository(private val notificationDao: NotificationDao) {
 
-    fun getAllNotifications() = notificationDao.getAllNotifications()
-
-    private fun insertNotifications(notifications: List<Notification>) {
-        notificationDao.insertNotifications(notifications)
-    }
+    suspend fun getAllNotifications() = notificationDao.getAllNotifications()
 
     suspend fun updateNotification(notification: Notification) {
         notificationDao.updateNotification(notification)
@@ -28,7 +24,7 @@ class NotificationRepository(private val notificationDao: NotificationDao) {
         var newContinueStr: String? = null
         val response = ServiceFactory.get(WikipediaApp.instance.wikiSite).getAllNotifications(wikiList, filter, continueStr)
         response.query?.notifications?.let {
-            insertNotifications(it.list.orEmpty())
+            notificationDao.insertNotifications(it.list.orEmpty())
             newContinueStr = it.continueStr
         }
         return newContinueStr

app/src/main/java/org/wikipedia/notifications/NotificationViewModel.kt

@@ -42,7 +42,7 @@ class NotificationViewModel : ViewModel() {
         fetchAndSave()
     }
 
-    private fun filterAndPostNotifications() {
+    private suspend fun filterAndPostNotifications() {
         val pair = Pair(processList(notificationRepository.getAllNotifications()), !currentContinueStr.isNullOrEmpty())
         _uiState.value = Resource.Success(pair)
     }

app/src/main/java/org/wikipedia/notifications/db/NotificationDao.kt

@@ -6,12 +6,11 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface NotificationDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertNotifications(notifications: List<Notification>)
+    suspend fun insertNotifications(notifications: List<Notification>)
 
     @Update(onConflict = OnConflictStrategy.REPLACE)
     suspend fun updateNotification(notification: Notification)
@@ -20,14 +19,14 @@ interface NotificationDao {
     suspend fun deleteNotification(notification: Notification)
 
     @Query("DELETE FROM Notification")
-    fun deleteAll()
+    suspend fun deleteAll()
 
     @Query("SELECT * FROM Notification")
-    fun getAllNotifications(): List<Notification>
+    suspend fun getAllNotifications(): List<Notification>
 
     @Query("SELECT * FROM Notification WHERE `wiki` IN (:wiki)")
-    fun getNotificationsByWiki(wiki: List<String>): Flow<List<Notification>>
+    suspend fun getNotificationsByWiki(wiki: List<String>): List<Notification>
 
     @Query("SELECT * FROM Notification WHERE `wiki` IN (:wiki) AND `id` IN (:id)")
-    fun getNotificationById(wiki: String, id: Long): Notification?
+    suspend fun getNotificationById(wiki: String, id: Long): Notification?
 }