Make ContentProvider block while downloading album art. Add placehold…

…er image when downloading
android · Feb 9, 2021 · f488c5f · f488c5f
1 parent 1982032
commit f488c5f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/app/src/main/java/com/example/android/uamp/MediaItemAdapter.kt b/app/src/main/java/com/example/android/uamp/MediaItemAdapter.kt
@@ -72,6 +72,7 @@ class MediaItemAdapter(
 
             Glide.with(holder.albumArt)
                 .load(mediaItem.albumArtUri)
+                .placeholder(R.drawable.default_art)
                 .into(holder.albumArt)
         }
     }

diff --git a/common/src/main/java/com/example/android/uamp/media/library/AlbumArtContentProvider.kt b/common/src/main/java/com/example/android/uamp/media/library/AlbumArtContentProvider.kt
@@ -22,11 +22,7 @@ import android.content.ContentValues
 import android.database.Cursor
 import android.net.Uri
 import android.os.ParcelFileDescriptor
-import android.util.Log
 import com.bumptech.glide.Glide
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileNotFoundException
 
@@ -53,28 +49,22 @@ class AlbumArtContentProvider : ContentProvider() {
         val context = this.context ?: return null
         val remoteUri = uriMap[uri] ?: throw FileNotFoundException(uri.path)
 
-        val file = File(context.cacheDir, uri.path)
-        return if (!file.exists()) {
-            GlobalScope.launch(Dispatchers.IO) {
-                // Use Glide to download the album art
-                val cacheFile = Glide.with(context)
-                    .asFile()
-                    .load(remoteUri)
-                    .submit()
-                    .get()
-
-                // Rename the file Glide created to match our own scheme.
-                cacheFile.renameTo(file)
-
-                // Notify the caller that the artwork has been updated.
-                context.contentResolver.notifyChange(uri, null)
-            }
-
-            // Provide placeholder art until the correct art can be downloaded.
-            context.assets.openFd("default_art.png").parcelFileDescriptor
-        } else {
-            ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY)
+        var file = File(context.cacheDir, uri.path)
+
+        if (!file.exists()) {
+            // Use Glide to download the album art.
+            val cacheFile = Glide.with(context)
+                .asFile()
+                .load(remoteUri)
+                .submit()
+                .get()
+
+            // Rename the file Glide created to match our own scheme.
+            cacheFile.renameTo(file)
+
+            file = cacheFile
         }
+        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY)
     }
 
     override fun insert(uri: Uri, values: ContentValues?): Uri? = null