Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: crash when starting audio player #6756

Merged
merged 1 commit into from
Nov 18, 2024
Merged

fix: crash when starting audio player #6756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions app/src/main/java/com/github/libretube/helpers/ImageHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package com.github.libretube.helpers
import android.content.Context
import android.graphics.Bitmap
import android.graphics.Color
import android.graphics.drawable.Drawable
import android.net.Uri
import android.widget.ImageView
import androidx.core.graphics.drawable.toBitmap
import androidx.core.graphics.drawable.toBitmapOrNull
import androidx.core.net.toUri
import coil.ImageLoader
import coil.disk.DiskCache
import coil.request.CachePolicy
Expand Down Expand Up @@ -87,17 +89,12 @@ object ImageHelper {
if (DataSaverMode.isEnabled(target.context) || url.isNullOrEmpty()) return
val urlToLoad = ProxyHelper.unwrapImageUrl(url)

val request = ImageRequest.Builder(target.context)
.data(urlToLoad)
.listener { _, result ->
// set the background to white for transparent images
if (whiteBackground) target.setBackgroundColor(Color.WHITE)
getImageWithCallback(target.context, urlToLoad) { result ->
// set the background to white for transparent images
if (whiteBackground) target.setBackgroundColor(Color.WHITE)

target.setImageDrawable(result.drawable)
}
.build()

imageLoader.enqueue(request)
target.setImageDrawable(result)
}
}

suspend fun downloadImage(context: Context, url: String, path: Path) {
Expand All @@ -110,18 +107,22 @@ object ImageHelper {
}

suspend fun getImage(context: Context, url: String?): Bitmap? {
return getImage(context, url?.toUri())
}

suspend fun getImage(context: Context, url: Uri?): Bitmap? {
val request = ImageRequest.Builder(context)
.data(url)
.build()

return imageLoader.execute(request).drawable?.toBitmapOrNull()
}

fun getImageWithCallback(context: Context, url: String?, onBitmap: (Bitmap) -> Unit) {
private fun getImageWithCallback(context: Context, url: String?, onSuccess: (Drawable) -> Unit) {
val request = ImageRequest.Builder(context)
.data(url)
.target { drawable ->
onBitmap(drawable.toBitmap())
onSuccess(drawable)
}
.build()

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/github/libretube/services/OfflinePlayerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ open class OfflinePlayerService : AbstractPlayerService() {
}

override suspend fun onServiceCreated(args: Bundle) {
if (args.isEmpty) return

downloadTab = args.serializable(IntentData.downloadTab)!!
shuffle = args.getBoolean(IntentData.shuffle, false)
noInternetService = args.getBoolean(IntentData.noInternet, false)
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ package com.github.libretube.ui.fragments

import android.annotation.SuppressLint
import android.graphics.Color
import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.text.format.DateUtils
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand Down Expand Up @@ -297,13 +299,13 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
NavigationHelper.navigateChannel(requireContext(), uploaderId)
}

metadata.artworkUri?.let { updateThumbnailAsync(it.toString()) }
metadata.artworkUri?.let { updateThumbnailAsync(it) }

initializeSeekBar()
}

private fun updateThumbnailAsync(thumbnailUrl: String) {
if (DataSaverMode.isEnabled(requireContext())) {
private fun updateThumbnailAsync(thumbnailUri: Uri) {
if (DataSaverMode.isEnabled(requireContext()) && !isOffline) {
binding.progress.isVisible = false
binding.thumbnail.setImageResource(R.drawable.ic_launcher_monochrome)
val primaryColor = ThemeHelper.getThemeColor(
Expand All @@ -321,7 +323,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {

lifecycleScope.launch {
val binding = _binding ?: return@launch
val bitmap = ImageHelper.getImage(requireContext(), thumbnailUrl)
val bitmap = ImageHelper.getImage(requireContext(), thumbnailUri)
binding.thumbnail.setImageBitmap(bitmap)
binding.miniPlayerThumbnail.setImageBitmap(bitmap)
binding.thumbnail.isVisible = true
Expand Down
Loading