Skip to content

Commit 9b50143

Browse files
committed
update to 12.8.1 (6916)
1 parent 68d5174 commit 9b50143

6 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎TMessagesProj/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,15 +395,13 @@
395395
android:excludeFromRecents="true"
396396
android:theme="@style/Theme.TMessages.TransparentWithAlerts"/>
397397

398-
<!--
399398
<receiver
400399
android:name=".AutoMessageHeardReceiver"
401400
android:exported="false">
402401
<intent-filter>
403402
<action android:name="org.telegram.messenger.ACTION_MESSAGE_HEARD"/>
404403
</intent-filter>
405404
</receiver>
406-
-->
407405

408406
<receiver
409407
android:name=".CopyCodeReceiver"

‎TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6134,16 +6134,18 @@ public static CharSequence formatRichBlock(TL_iv.PageBlock block, boolean isOut,
61346134
final TL_iv.PageListItem item = list.items.get(j);
61356135
if (item instanceof TL_iv.TL_pageListItemText) {
61366136
final TL_iv.TL_pageListItemText i = (TL_iv.TL_pageListItemText) item;
6137-
out.append("• ");
61386137
if (i.checkbox) {
6139-
out.append(i.checked ? "✅ " : "⬛️ ");
6138+
out.append(i.checked ? "✅ " : "☑️ ");
6139+
} else {
6140+
out.append("• ");
61406141
}
61416142
formatRichText(i.text, isOut, photoViewer, maxLength, out, 0);
61426143
} else if (item instanceof TL_iv.TL_pageListItemBlocks) {
61436144
final TL_iv.TL_pageListItemBlocks i = (TL_iv.TL_pageListItemBlocks) item;
6144-
out.append("• ");
61456145
if (i.checkbox) {
6146-
out.append(i.checked ? "✅ " : "⬛️ ");
6146+
out.append(i.checked ? "✅ " : "☑️ ");
6147+
} else {
6148+
out.append("• ");
61476149
}
61486150
for (int k = 0; k < i.blocks.size(); ++k) {
61496151
if (k > 0) out.append("\n");
@@ -6171,15 +6173,15 @@ public static CharSequence formatRichBlock(TL_iv.PageBlock block, boolean isOut,
61716173
out.append(i.num);
61726174
out.append(". ");
61736175
if (i.checkbox) {
6174-
out.append(i.checked ? "✅ " : "⬛️ ");
6176+
out.append(i.checked ? "✅ " : "☑️ ");
61756177
}
61766178
formatRichText(i.text, isOut, photoViewer, maxLength, out, 0);
61776179
} else if (item instanceof TL_iv.TL_pageListOrderedItemBlocks) {
61786180
final TL_iv.TL_pageListOrderedItemBlocks i = (TL_iv.TL_pageListOrderedItemBlocks) item;
61796181
out.append(i.num);
61806182
out.append(". ");
61816183
if (i.checkbox) {
6182-
out.append(i.checked ? "✅ " : "⬛️ ");
6184+
out.append(i.checked ? "✅ " : "☑️ ");
61836185
}
61846186
for (int k = 0; k < i.blocks.size(); ++k) {
61856187
if (k > 0) out.append("\n");
@@ -8514,6 +8516,7 @@ private boolean applyEntities() {
85148516
}
85158517

85168518
public static StaticLayout makeStaticLayout(CharSequence text_, TextPaint paint, int width, float lineSpacingMult, float lineSpacingAdd, boolean dontIncludePad) {
8519+
if (width <= 0) width = 1;
85178520
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
85188521
final CharSequence text = /* Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ?
85198522
PrecomputedText.create(text_, new PrecomputedText.Params.Builder(paint).build()) :*/ text_;

‎TMessagesProj/src/main/java/org/telegram/messenger/RichMessageLayout.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ private void emitCaption(TL_iv.PageCaption caption, Rect padding, int textFlags)
440440
}
441441

442442
private RichBlock emitBlock(TL_iv.PageBlock pageBlock, int level, Rect padding, int textFlags) {
443+
if (padding.left + padding.right >= maxWidth) return null;
443444
if (pageBlock instanceof TL_iv.pageBlockThinking) {
444445
final RichThinkingBlock block = new RichThinkingBlock(this, new Rect(), maxWidth, formatText(pageBlock.text));
445446
blocks.add(block);

‎TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7229,7 +7229,7 @@ private void bindBlockToHolder(int type, RecyclerView.ViewHolder holder, TL_iv.P
72297229
}
72307230
case 9: {
72317231
BlockPhotoCell cell = (BlockPhotoCell) holder.itemView;
7232-
cell.setBlock((TL_iv.pageBlockPhoto) block, currentPage.cached_page, null, calcHeight, position == 0);
7232+
cell.setBlock((TL_iv.pageBlockPhoto) block, currentPage, null, calcHeight, position == 0);
72337233
cell.setParentBlock(originalBlock);
72347234
break;
72357235
}
@@ -7300,7 +7300,7 @@ private void bindBlockToHolder(int type, RecyclerView.ViewHolder holder, TL_iv.P
73007300
}
73017301
case 23: {
73027302
BlockRelatedArticlesCell cell = (BlockRelatedArticlesCell) holder.itemView;
7303-
cell.setBlock((TL_pageBlockRelatedArticlesChild) block, currentPage.cached_page);
7303+
cell.setBlock((TL_pageBlockRelatedArticlesChild) block, currentPage);
73047304
break;
73057305
}
73067306
case 24: {

‎TMessagesProj/src/main/java/org/telegram/ui/Components/Reactions/ChatSelectionReactionMenuOverlay.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ private MessageObject findPrimaryObject() {
299299
}
300300

301301
private boolean isMessageTypeAllowed(MessageObject obj) {
302+
if (obj != null && obj.messageOwner != null && obj.messageOwner.rich_message != null) return true;
302303
return obj != null && !obj.needDrawBluredPreview() && (
303304
MessageObject.isPhoto(obj.messageOwner) && MessageObject.getMedia(obj.messageOwner).webpage == null ||
304305
obj.getDocument() != null && (

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1414
# org.gradle.parallel=true
1515
#Sat Mar 12 05:53:50 MSK 2016
16-
APP_VERSION_CODE=6913
17-
APP_VERSION_NAME=12.8.0
16+
APP_VERSION_CODE=6916
17+
APP_VERSION_NAME=12.8.1
1818
APP_PACKAGE=org.telegram.messenger
1919
IS_PRIVATE=false
2020
RELEASE_KEY_PASSWORD=android

0 commit comments

Comments
 (0)