yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

avoid NPE in DecryptableUri

Browse source
This commit is contained in:
adbenitez 2025-08-09 15:24:02 +02:00
parent a0d9315ff4
commit 786fd3f47d
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
View file

@ -237,12 +237,14 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
MediaUtil.createVideoThumbnailIfNeeded(getContext(), slide.getUri(), slide.getThumbnailUri(), null); MediaUtil.createVideoThumbnailIfNeeded(getContext(), slide.getUri(), slide.getThumbnailUri(), null);
thumbnailUri = slide.getThumbnailUri(); thumbnailUri = slide.getThumbnailUri();
} }
if (thumbnailUri != null) {
glideRequests.load(new DecryptableUri(thumbnailUri)) glideRequests.load(new DecryptableUri(thumbnailUri))
.centerCrop() .centerCrop()
.override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size)) .override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
.diskCacheStrategy(DiskCacheStrategy.RESOURCE) .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.into(thumbnailView); .into(thumbnailView);
} }
}
} else if(slide != null && slide.hasAudio()) { } else if(slide != null && slide.hasAudio()) {
thumbnailView.setVisibility(GONE); thumbnailView.setVisibility(GONE);
attachmentContainerView.setVisibility(GONE); attachmentContainerView.setVisibility(GONE);

2
src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
View file

@ -179,7 +179,7 @@ final class UriGlideRenderer implements Renderer {
.diskCacheStrategy(DiskCacheStrategy.NONE) .diskCacheStrategy(DiskCacheStrategy.NONE)
.override(width, height) .override(width, height)
.centerInside() .centerInside()
.load(decryptable ? new DecryptableStreamUriLoader.DecryptableUri(imageUri) : imageUri); .load(decryptable && imageUri!=null ? new DecryptableStreamUriLoader.DecryptableUri(imageUri) : imageUri);
} }
@Override @Override