bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[v25.1] fix crash when glide fails to load avatar in ShareShortcutHelper (#4417)

Browse source 
🙄 
fixes #4416
This commit is contained in:
Konrad Pozniak 2024-05-04 18:36:39 +02:00 committed by GitHub
parent 056aaa7e0e
commit c10f82ffa6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/util/GlideExtensions.kt
View file

@ -8,7 +8,6 @@ import com.bumptech.glide.request.target.Target
import kotlin.coroutines.resume import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException import kotlin.coroutines.resumeWithException
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import okio.IOException
/** /**
* Allows waiting for a Glide request to complete without blocking a background thread. * Allows waiting for a Glide request to complete without blocking a background thread.
@ -26,7 +25,7 @@ suspend fun <R> RequestBuilder<R>.submitAsync(
target: Target<R>, target: Target<R>,
isFirstResource: Boolean isFirstResource: Boolean
): Boolean { ): Boolean {
continuation.resumeWithException(e ?: IOException("Image loading failed")) continuation.resumeWithException(e ?: GlideException("Image loading failed"))
return false return false
} }

18
app/src/main/java/com/keylesspalace/tusky/util/ShareShortcutHelper.kt
View file

@ -21,11 +21,15 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Canvas import android.graphics.Canvas
import android.util.Log
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.app.Person import androidx.core.app.Person
import androidx.core.content.pm.ShortcutInfoCompat import androidx.core.content.pm.ShortcutInfoCompat
import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.content.pm.ShortcutManagerCompat
import androidx.core.graphics.drawable.IconCompat import androidx.core.graphics.drawable.IconCompat
import androidx.core.graphics.drawable.toBitmap
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.GlideException
import com.keylesspalace.tusky.MainActivity import com.keylesspalace.tusky.MainActivity
import com.keylesspalace.tusky.R import com.keylesspalace.tusky.R
import com.keylesspalace.tusky.db.AccountEntity import com.keylesspalace.tusky.db.AccountEntity
@ -49,14 +53,20 @@ class ShareShortcutHelper @Inject constructor(
val maxNumberOfShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context) val maxNumberOfShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context)
val shortcuts = accountManager.accounts.take(maxNumberOfShortcuts).map { account -> val shortcuts = accountManager.accounts.take(maxNumberOfShortcuts).mapNotNull { account ->
val bmp = Glide.with(context) val bmp = try {
Glide.with(context)
.asBitmap() .asBitmap()
.load(account.profilePictureUrl) .load(account.profilePictureUrl)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_default) .error(R.drawable.avatar_default)
.submitAsync(innerSize, innerSize) .submitAsync(innerSize, innerSize)
} catch (e: GlideException) {
// https://github.com/bumptech/glide/issues/4672 :/
Log.w(TAG, "failed to load avatar ${account.profilePictureUrl}", e)
AppCompatResources.getDrawable(context, R.drawable.avatar_default)?.toBitmap(innerSize, innerSize) ?: return@mapNotNull null
}
// inset the loaded bitmap inside a 108dp transparent canvas so it looks good as adaptive icon // inset the loaded bitmap inside a 108dp transparent canvas so it looks good as adaptive icon
val outBmp = Bitmap.createBitmap(outerSize, outerSize, Bitmap.Config.ARGB_8888) val outBmp = Bitmap.createBitmap(outerSize, outerSize, Bitmap.Config.ARGB_8888)
@ -100,4 +110,8 @@ class ShareShortcutHelper @Inject constructor(
fun removeShortcut(account: AccountEntity) { fun removeShortcut(account: AccountEntity) {
ShortcutManagerCompat.removeDynamicShortcuts(context, listOf(account.id.toString())) ShortcutManagerCompat.removeDynamicShortcuts(context, listOf(account.id.toString()))
} }
companion object {
private const val TAG = "ShareShortcutHelper"
}
} }