Merge branch 'main' into adb/issue-3795

This commit is contained in:
adb
2025-08-14 16:25:04 +02:00
committed by GitHub
19 changed files with 246 additions and 341 deletions
@@ -67,6 +67,7 @@ public class EphemeralMessagesDialog {
case 5: burnAfter = TimeUnit.DAYS.toSeconds(1); break;
case 6: burnAfter = TimeUnit.DAYS.toSeconds(7); break;
case 7: burnAfter = TimeUnit.DAYS.toSeconds(35); break;
case 8: burnAfter = TimeUnit.DAYS.toSeconds(365); break;
default: burnAfter = 0; break;
}
listener.onTimeSelected(burnAfter);
@@ -103,7 +104,10 @@ public class EphemeralMessagesDialog {
if (timespan < TimeUnit.DAYS.toSeconds(35)) {
return 6; // 1 week
}
return 7; // 5 weeks
if (timespan < TimeUnit.DAYS.toSeconds(365)) {
return 7; // 5 weeks
}
return 8; // 1 year
}
}
@@ -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);
@@ -226,6 +226,8 @@ public class DcHelper {
dcContext.setStockTranslation(155, context.getString(R.string.ephemeral_timer_days_by_other));
dcContext.setStockTranslation(156, context.getString(R.string.ephemeral_timer_weeks_by_you));
dcContext.setStockTranslation(157, context.getString(R.string.ephemeral_timer_weeks_by_other));
dcContext.setStockTranslation(158, context.getString(R.string.ephemeral_timer_1_year_by_you));
dcContext.setStockTranslation(159, context.getString(R.string.ephemeral_timer_1_year_by_other));
// HACK: svg does not handle entities correctly and shows `&quot;` as the text `quot;`.
// until that is fixed, we fix the most obvious errors (core uses encode_minimal, so this does not affect so many characters)
@@ -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