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

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Hosted Weblate 2025-08-13 11:56:56 +00:00
commit cffb58fdba
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,11 +237,13 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
MediaUtil.createVideoThumbnailIfNeeded(getContext(), slide.getUri(), slide.getThumbnailUri(), null);
thumbnailUri = slide.getThumbnailUri();
}
glideRequests.load(new DecryptableUri(thumbnailUri))
.centerCrop()
.override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.into(thumbnailView);
if (thumbnailUri != null) {
glideRequests.load(new DecryptableUri(thumbnailUri))
.centerCrop()
.override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
.diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.into(thumbnailView);
}
}
} else if(slide != null && slide.hasAudio()) {
thumbnailView.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)
.override(width, height)
.centerInside()
.load(decryptable ? new DecryptableStreamUriLoader.DecryptableUri(imageUri) : imageUri);
.load(decryptable && imageUri!=null ? new DecryptableStreamUriLoader.DecryptableUri(imageUri) : imageUri);
}
@Override