diff --git a/android/app/src/main/java/com/audiobookshelf/app/MediaPlayerWidget.kt b/android/app/src/main/java/com/audiobookshelf/app/MediaPlayerWidget.kt index 5bb5823c..cc5b1d1e 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/MediaPlayerWidget.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/MediaPlayerWidget.kt @@ -96,8 +96,8 @@ internal fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManage views.setViewVisibility(R.id.widgetButtonContainer, if (isAppClosed) View.GONE else View.VISIBLE) views.setOnClickPendingIntent(R.id.widgetBackground, wholeWidgetClickPI) - - val imageUri = playbackSession?.getCoverUri() ?: Uri.parse("android.resource://com.audiobookshelf.app/" + R.drawable.icon) + + val imageUri = playbackSession?.getCoverUri() ?: Uri.parse("android.resource://${BuildConfig.APPLICATION_ID}/" + R.drawable.icon) val awt: AppWidgetTarget = object : AppWidgetTarget(context.applicationContext, R.id.widgetAlbumArt, views, appWidgetId) { override fun onResourceReady(resource: Bitmap, transition: Transition?) { super.onResourceReady(resource, transition) diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/LibraryItem.kt b/android/app/src/main/java/com/audiobookshelf/app/data/LibraryItem.kt index b0e9a5a0..cc44cc17 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/LibraryItem.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/LibraryItem.kt @@ -5,6 +5,7 @@ import android.net.Uri import android.os.Bundle import android.support.v4.media.MediaDescriptionCompat import androidx.media.utils.MediaConstants +import com.audiobookshelf.app.BuildConfig import com.audiobookshelf.app.R import com.audiobookshelf.app.device.DeviceManager import com.fasterxml.jackson.annotation.JsonIgnore @@ -41,7 +42,7 @@ class LibraryItem( @JsonIgnore fun getCoverUri(): Uri { if (media.coverPath == null) { - return Uri.parse("android.resource://com.audiobookshelf.app/" + R.drawable.icon) + return Uri.parse("android.resource://${BuildConfig.APPLICATION_ID}/" + R.drawable.icon) } return Uri.parse("${DeviceManager.serverAddress}/api/items/$id/cover?token=${DeviceManager.token}") diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/LocalLibraryItem.kt b/android/app/src/main/java/com/audiobookshelf/app/data/LocalLibraryItem.kt index b6a8ae83..c4af87ee 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/LocalLibraryItem.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/LocalLibraryItem.kt @@ -10,6 +10,7 @@ import android.provider.MediaStore import android.support.v4.media.MediaDescriptionCompat import android.util.Log import androidx.media.utils.MediaConstants +import com.audiobookshelf.app.BuildConfig import com.audiobookshelf.app.R import com.audiobookshelf.app.device.DeviceManager import com.fasterxml.jackson.annotation.JsonIgnore @@ -46,7 +47,7 @@ class LocalLibraryItem( @JsonIgnore fun getCoverUri(): Uri { - return if (coverContentUrl != null) Uri.parse(coverContentUrl) else Uri.parse("android.resource://com.audiobookshelf.app/" + R.drawable.icon) + return if (coverContentUrl != null) Uri.parse(coverContentUrl) else Uri.parse("android.resource://${BuildConfig.APPLICATION_ID}/" + R.drawable.icon) } @JsonIgnore diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt b/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt index 0616efc8..d7fccbb0 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/PlaybackSession.kt @@ -6,6 +6,8 @@ import android.net.Uri import android.os.Build import android.provider.MediaStore import android.support.v4.media.MediaMetadataCompat +import com.audiobookshelf.app.BuildConfig +import com.audiobookshelf.app.R import com.audiobookshelf.app.device.DeviceManager import com.audiobookshelf.app.media.MediaProgressSyncData import com.fasterxml.jackson.annotation.JsonIgnore @@ -136,9 +138,9 @@ class PlaybackSession( @JsonIgnore fun getCoverUri(): Uri { - if (localLibraryItem?.coverContentUrl != null) return Uri.parse(localLibraryItem?.coverContentUrl) ?: Uri.parse("android.resource://com.audiobookshelf.app/" + com.audiobookshelf.app.R.drawable.icon) + if (localLibraryItem?.coverContentUrl != null) return Uri.parse(localLibraryItem?.coverContentUrl) ?: Uri.parse("android.resource://${BuildConfig.APPLICATION_ID}/" + R.drawable.icon) - if (coverPath == null) return Uri.parse("android.resource://com.audiobookshelf.app/" + com.audiobookshelf.app.R.drawable.icon) + if (coverPath == null) return Uri.parse("android.resource://${BuildConfig.APPLICATION_ID}/" + R.drawable.icon) return Uri.parse("$serverAddress/api/items/$libraryItemId/cover?token=${DeviceManager.token}") } diff --git a/android/app/src/main/java/com/audiobookshelf/app/player/AbMediaDescriptionAdapter.kt b/android/app/src/main/java/com/audiobookshelf/app/player/AbMediaDescriptionAdapter.kt index 3a2c2064..12cb827a 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/player/AbMediaDescriptionAdapter.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/player/AbMediaDescriptionAdapter.kt @@ -8,6 +8,7 @@ import android.os.Build import android.provider.MediaStore import android.support.v4.media.session.MediaControllerCompat import android.util.Log +import com.audiobookshelf.app.BuildConfig import com.audiobookshelf.app.R import com.bumptech.glide.Glide import com.google.android.exoplayer2.Player @@ -83,7 +84,7 @@ class AbMediaDescriptionAdapter constructor(private val controller: MediaControl Glide.with(playerNotificationService) .asBitmap() - .load(Uri.parse("android.resource://com.audiobookshelf.app/" + R.drawable.icon)) + .load(Uri.parse("android.resource://${BuildConfig.APPLICATION_ID}/" + R.drawable.icon)) .submit(NOTIFICATION_LARGE_ICON_SIZE, NOTIFICATION_LARGE_ICON_SIZE) .get() }