From fff7c8d97f5ca5708a1252ed58a6bb526de6e08e Mon Sep 17 00:00:00 2001 From: Arseny271 Date: Mon, 8 Dec 2025 21:06:33 +0400 Subject: [PATCH] update to 12.2.10 (6341) --- .../telegram/messenger/AppGlobalConfig.java | 2 +- .../org/telegram/messenger/MessageObject.java | 2 ++ .../org/telegram/ui/Cells/ChatActionCell.java | 2 +- .../org/telegram/ui/Cells/ChatMessageCell.java | 6 ++++++ .../ui/Components/ProfileGooeyView.java | 18 ++++++++++++++++-- .../telegram/ui/Gifts/AuctionWearingSheet.java | 2 +- .../java/org/telegram/ui/Gifts/GiftSheet.java | 2 +- .../java/org/telegram/ui/LaunchActivity.java | 1 + gradle.properties | 4 ++-- 9 files changed, 31 insertions(+), 8 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/AppGlobalConfig.java b/TMessagesProj/src/main/java/org/telegram/messenger/AppGlobalConfig.java index b619ec426..085dc1017 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/AppGlobalConfig.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/AppGlobalConfig.java @@ -51,7 +51,7 @@ public class AppGlobalConfig { public final ConfigInt passkeysAccountPasskeysMax = ofInt("passkeys_account_passkeys_max", 5); - public final ConfigBoolean settingsDisplayPasskeys = ofBoolean("settings_display_passkeys", false); + public final ConfigBoolean settingsDisplayPasskeys = ofBoolean("settings_display_passkeys", BuildVars.DEBUG_VERSION ? true : false); /* * */ diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java index 34cce29e8..11f853c9d 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java @@ -1213,6 +1213,8 @@ public class MessageObject { public boolean isDocuments; public boolean captionAbove; + public int cachedWidthForCaption = -1; + public GroupedMessagePosition getPosition(MessageObject msg) { if (msg == null) { return null; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java index c7a7d877c..cb83e641e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java @@ -2098,7 +2098,7 @@ public class ChatActionCell extends BaseCell implements DownloadController.FileD title = Emoji.replaceEmoji(title, giftTextPaint.getFontMetricsInt(), false, null); title = MessageObject.replaceAnimatedEmoji(title, action.message.entities, giftTextPaint.getFontMetricsInt()); } else if (action.auction_acquired) { - title = formatString(R.string.Gift2ActionWonActionText, formatNumber(action.gift.stars, ',')); + title = formatString(R.string.Gift2ActionWonActionText, formatNumber(action.gift.stars + action.upgrade_stars, ',')); } else if (isForChannel) { if (action.converted) { title = formatPluralStringComma("Gift2ActionConvertedInfo", (int) stars); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java index 119fa5053..b90248b41 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -9627,6 +9627,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } boolean checkCaption = true; if ((currentPosition.flags & captionFlag()) != 0 || captionAbove || currentMessagesGroup.hasSibling && (currentPosition.flags & MessageObject.POSITION_FLAG_TOP) == 0) { + if (currentPosition == null || (currentPosition.flags & captionFlag()) != 0) { widthForCaption += getAdditionalWidthForPosition(currentPosition); } @@ -9684,6 +9685,11 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate } } } + if ((currentPosition.flags & MessageObject.POSITION_FLAG_LEFT) != 0 && currentCaption != null) { + currentMessagesGroup.cachedWidthForCaption = widthForCaption; + } else if (currentMessagesGroup.cachedWidthForCaption > 0) { + widthForCaption = currentMessagesGroup.cachedWidthForCaption; + } } } else { photoHeight = h; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGooeyView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGooeyView.java index 70a656aaf..6d074d654 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGooeyView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGooeyView.java @@ -14,6 +14,8 @@ import android.graphics.ColorMatrixColorFilter; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Path; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; import android.graphics.RectF; import android.graphics.RenderEffect; import android.graphics.RenderNode; @@ -161,16 +163,26 @@ public class ProfileGooeyView extends FrameLayout { private Bitmap bitmap; private Canvas bitmapCanvas; private final Paint bitmapPaint = new Paint(); + private final Paint bitmapPaint2 = new Paint(); private int optimizedH; private int optimizedW; private int bitmapOrigW, bitmapOrigH; - private final float scaleConst = 3f; + private final float scaleConst = 5f; { bitmapPaint.setFlags(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG); bitmapPaint.setFilterBitmap(true); + bitmapPaint2.setFlags(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG); + bitmapPaint2.setFilterBitmap(true); + bitmapPaint2.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP)); + bitmapPaint.setColorFilter(new ColorMatrixColorFilter(new float[] { + 0f, 0f, 0f, 0f, 0f, + 0f, 0f, 0f, 0f, 0f, + 0f, 0f, 0f, 0f, 0f, + 0f, 0f, 0f, 60, -7500 + })); } @Override @@ -234,13 +246,15 @@ public class ProfileGooeyView extends FrameLayout { // Blur buffer Utilities.stackBlurBitmap(bitmap, (int) (intensity * 2 / scaleConst)); - Utilities.applyAlphaThreshold(bitmap, 125); // Filter alpha + fade, then draw canvas.save(); canvas.translate(optimizedOffsetX, 0); + canvas.saveLayer(0, 0, bitmapOrigW, bitmapOrigH, null); canvas.scale((float) bitmapOrigW / bitmap.getWidth(), (float) bitmapOrigH / bitmap.getHeight()); canvas.drawBitmap(bitmap, 0, 0, bitmapPaint); + canvas.drawBitmap(bitmap, 0, 0, bitmapPaint2); + canvas.restore(); canvas.restore(); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Gifts/AuctionWearingSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Gifts/AuctionWearingSheet.java index 2d23185ff..32c9db6a2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Gifts/AuctionWearingSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Gifts/AuctionWearingSheet.java @@ -252,7 +252,7 @@ public class AuctionWearingSheet extends BottomSheetWithRecyclerListView impleme }; giftCell.setPriorityAuction(); giftCell.setStarsGift(starGift, true, false, false, false); - giftCell.setImageSize(dp(100)); + giftCell.setImageSize(dp(84)); giftCell.setImageLayer(7); giftCell.hidePrice(); giftCell.cardBackground.setStrokeColors(null); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Gifts/GiftSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Gifts/GiftSheet.java index f2671f965..ee2d99934 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Gifts/GiftSheet.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Gifts/GiftSheet.java @@ -1518,7 +1518,7 @@ public class GiftSheet extends BottomSheetWithRecyclerListView implements Notifi final TL_stars.starGiftAttributeBackdrop backdrop = findAttribute(gift.attributes, TL_stars.starGiftAttributeBackdrop.class); cardBackground.setBackdrop(backdrop); cardBackground.setPattern(findAttribute(gift.attributes, TL_stars.starGiftAttributePattern.class)); - if (gift.auction && (!gift.sold_out || priotityAuction)) { + if (gift.auction && (!gift.sold_out || priotityAuction) && !(allowResaleInGifts && gift.availability_resale > 0)) { if (gift.sold_out) { cardBackground.setStrokeColors(new int[] { Theme.getColor(Theme.key_gift_ribbon_soldout, resourcesProvider), diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index 6ce68f643..fa4937f6b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -3131,6 +3131,7 @@ public class LaunchActivity extends BasePermissionsActivity implements INavigati ((ChatActivity) lastFragment).shakeContent(); } } + return; } new GiftSheet(this, intentAccount[0], peerId, null) diff --git a/gradle.properties b/gradle.properties index ec8953057..d29d4cc02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,8 +13,8 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Sat Mar 12 05:53:50 MSK 2016 -APP_VERSION_CODE=6337 -APP_VERSION_NAME=12.2.9 +APP_VERSION_CODE=6341 +APP_VERSION_NAME=12.2.10 APP_PACKAGE=org.telegram.messenger IS_PRIVATE=false RELEASE_KEY_PASSWORD=android