Use suspending methods in MuzeiDocumentsProvider

Replace blocking methods with their suspending method equivalents.
muzei · Dec 6, 2018 · 019c1b6 · 019c1b6
1 parent ab70bf8
commit 019c1b6
Showing 1 changed file with 22 additions and 24 deletions.
diff --git a/...ent-common/src/main/java/com/google/android/apps/muzei/provider/MuzeiDocumentsProvider.kt b/...ent-common/src/main/java/com/google/android/apps/muzei/provider/MuzeiDocumentsProvider.kt
@@ -97,10 +97,10 @@ class MuzeiDocumentsProvider : DocumentsProvider() {
         val context = context ?: return result
 
         val likeAnyPositionQuery = "%$query%"
-        includeAllArtwork(result, runBlocking {
-            MuzeiDatabase.getInstance(context).artworkDao()
-                    .searchArtwork(likeAnyPositionQuery)
-        })
+        runBlocking {
+            includeAllArtwork(result, MuzeiDatabase.getInstance(context).artworkDao()
+                    .searchArtwork(likeAnyPositionQuery))
+        }
         return result
     }
 
@@ -121,23 +121,21 @@ class MuzeiDocumentsProvider : DocumentsProvider() {
         val result = MatrixCursor(projection ?: DEFAULT_DOCUMENT_PROJECTION)
         val context = context ?: return result
         if (ROOT_DOCUMENT_ID == parentDocumentId) {
-            includeAllArtwork(result, runBlocking {
-                MuzeiDatabase.getInstance(context).artworkDao()
-                        .getArtwork()
-            })
+            runBlocking {
+                includeAllArtwork(result, MuzeiDatabase.getInstance(context).artworkDao()
+                        .getArtwork())
+            }
             result.setNotificationUri(context.contentResolver,
                     DocumentsContract.buildDocumentUri(BuildConfig.DOCUMENTS_AUTHORITY,
                             ROOT_DOCUMENT_ID))
         }
         return result
     }
 
-    private fun includeAllArtwork(result: MatrixCursor, artworkList: List<Artwork>) {
+    private suspend fun includeAllArtwork(result: MatrixCursor, artworkList: List<Artwork>) {
         val context = context ?: return
-        val currentArtworkId = ensureBackground {
-            MuzeiDatabase.getInstance(context).artworkDao()
-                    .currentArtworkBlocking?.id
-        } ?: -1
+        val currentArtworkId = MuzeiDatabase.getInstance(context).artworkDao()
+                .getCurrentArtwork()?.id ?: -1
         for (artwork in artworkList) {
             result.newRow().apply {
                 add(DocumentsContract.Document.COLUMN_DOCUMENT_ID,
@@ -174,18 +172,18 @@ class MuzeiDocumentsProvider : DocumentsProvider() {
                 // so just return an empty result
                 return result
             }
-            val artwork = runBlocking {
-                MuzeiDatabase.getInstance(context).artworkDao()
+            runBlocking {
+                val artwork = MuzeiDatabase.getInstance(context).artworkDao()
                         .getArtworkById(artworkId)
-            }
-            if (artwork != null) {
-                includeAllArtwork(result, listOf(artwork))
-            } else {
-                // The artwork isn't there anymore. Delete it to
-                // revoke any document permissions attached to it
-                DocumentsContract.deleteDocument(context.contentResolver,
-                        DocumentsContract.buildDocumentUri(BuildConfig.DOCUMENTS_AUTHORITY,
-                                documentId))
+                if (artwork != null) {
+                    includeAllArtwork(result, listOf(artwork))
+                } else {
+                    // The artwork isn't there anymore. Delete it to
+                    // revoke any document permissions attached to it
+                    DocumentsContract.deleteDocument(context.contentResolver,
+                            DocumentsContract.buildDocumentUri(BuildConfig.DOCUMENTS_AUTHORITY,
+                                    documentId))
+                }
             }
         }
         return result