empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix possible NPE when opening a story.

Browse source
This commit is contained in:
Greyson Parrelli 2023-05-24 22:48:01 -04:00 • committed by Cody Henthorne
parent 3e21fb77c7
commit 7c28d8ad51
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryImageLoader.kt
View file

@ -60,8 +60,8 @@ class StoryImageLoader(
fun load() { fun load() {
val cacheValue = storyCache.getFromCache(imagePost.imageUri) val cacheValue = storyCache.getFromCache(imagePost.imageUri)
if (cacheValue != null) { if (cacheValue?.imageTarget != null) {
loadViaCache(cacheValue) loadViaCache(cacheValue.imageTarget)
} else { } else {
loadViaGlide(storySize) loadViaGlide(storySize)
} }
@ -77,10 +77,9 @@ class StoryImageLoader(
blurLoader.clear() blurLoader.clear()
} }
private fun loadViaCache(cacheValue: StoryCache.StoryCacheValue) { private fun loadViaCache(imageTarget: StoryCache.StoryCacheTarget) {
Log.d(TAG, "Image in cache. Loading via cache...") Log.d(TAG, "Image in cache. Loading via cache...")
val imageTarget = cacheValue.imageTarget!!
imageTarget.addListener(imageListener) imageTarget.addListener(imageListener)
fragment.viewLifecycleOwner.lifecycle.addObserver(OnDestroy { imageTarget.removeListener(imageListener) }) fragment.viewLifecycleOwner.lifecycle.addObserver(OnDestroy { imageTarget.removeListener(imageListener) })
} }