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.

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: RequestBuilder.submitAsync() throwing an Exception if the Glide request is restarted #4569

Merged
merged 1 commit into from
Jul 14, 2024
Merged
Changes from all commits
Commits
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
60 changes: 35 additions & 25 deletions app/src/main/java/com/keylesspalace/tusky/util/GlideExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target
import kotlin.coroutines.Continuation
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException
import kotlinx.coroutines.suspendCancellableCoroutine
Expand All @@ -17,32 +18,41 @@ suspend fun <R> RequestBuilder<R>.submitAsync(
height: Int = Target.SIZE_ORIGINAL
): R {
return suspendCancellableCoroutine { continuation ->
val target = addListener(
object : RequestListener<R> {
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<R>,
isFirstResource: Boolean
): Boolean {
continuation.resumeWithException(e ?: GlideException("Image loading failed"))
return false
}
val target = addListener(ContinuationRequestListener(continuation))
.submit(width, height)
continuation.invokeOnCancellation { target.cancel(true) }
}
}

private class ContinuationRequestListener<R>(continuation: Continuation<R>) : RequestListener<R> {
private var continuation: Continuation<R>? = continuation

override fun onResourceReady(
resource: R & Any,
model: Any,
target: Target<R>?,
dataSource: DataSource,
isFirstResource: Boolean
): Boolean {
if (target?.request?.isComplete == true) {
continuation.resume(resource)
}
return false
}
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<R>,
isFirstResource: Boolean
): Boolean {
continuation?.let {
continuation = null
it.resumeWithException(e ?: GlideException("Image loading failed"))
}
return false
}

override fun onResourceReady(
resource: R & Any,
model: Any,
target: Target<R>?,
dataSource: DataSource,
isFirstResource: Boolean
): Boolean {
continuation?.let {
if (target?.request?.isComplete == true) {
continuation = null
it.resume(resource)
}
).submit(width, height)
continuation.invokeOnCancellation { target.cancel(true) }
}
return false
}
}
Loading