Skip to content

Commit 6b4602c

Browse files
xaxtixxaxtix
committed
update to 10.0.9 (3872)
1 parent dcad7b4 commit 6b4602c

25 files changed

+568
-520
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public class BuildVars {
2424
public static boolean USE_CLOUD_STRINGS = true;
2525
public static boolean CHECK_UPDATES = true;
2626
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
27-
public static int BUILD_VERSION = 3867;
28-
public static String BUILD_VERSION_STRING = "10.0.8";
27+
public static int BUILD_VERSION = 3872;
28+
public static String BUILD_VERSION_STRING = "10.0.9";
2929
public static int APP_ID = 4;
3030
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";
3131

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2994,10 +2994,10 @@ private void loadStickerSetThumbInternal(TLRPC.PhotoSize thumb, Object parentObj
29942994
* @param toggle 0 - remove, 1 - archive, 2 - add
29952995
*/
29962996
public void toggleStickerSet(Context context, TLObject stickerSetObject, int toggle, BaseFragment baseFragment, boolean showSettings, boolean showTooltip) {
2997-
toggleStickerSet(context, stickerSetObject, toggle, baseFragment, showSettings, showTooltip, null);
2997+
toggleStickerSet(context, stickerSetObject, toggle, baseFragment, showSettings, showTooltip, null, true);
29982998
}
29992999

3000-
public void toggleStickerSet(Context context, TLObject stickerSetObject, int toggle, BaseFragment baseFragment, boolean showSettings, boolean showTooltip, Runnable onUndo) {
3000+
public void toggleStickerSet(Context context, TLObject stickerSetObject, int toggle, BaseFragment baseFragment, boolean showSettings, boolean showTooltip, Runnable onUndo, boolean forget) {
30013001
TLRPC.StickerSet stickerSet;
30023002
TLRPC.TL_messages_stickerSet messages_stickerSet;
30033003

@@ -3036,7 +3036,7 @@ public void toggleStickerSet(Context context, TLObject stickerSetObject, int tog
30363036
stickerSets[type].remove(a);
30373037
if (toggle == 2) {
30383038
stickerSets[type].add(0, set);
3039-
} else {
3039+
} else if (forget) {
30403040
stickerSetsById.remove(set.set.id);
30413041
installedStickerSetsById.remove(set.set.id);
30423042
stickerSetsByName.remove(set.set.short_name);
@@ -7233,6 +7233,19 @@ public void moveStickerSetToTop(long setId, boolean emojis, boolean masks) {
72337233
}
72347234
}
72357235

7236+
public void applyAttachMenuBot(TLRPC.TL_attachMenuBotsBot attachMenuBot) {
7237+
attachMenuBots.bots.add(attachMenuBot.bot);
7238+
}
7239+
7240+
public boolean botInAttachMenu(long id) {
7241+
for (int i = 0; i < attachMenuBots.bots.size(); i++) {
7242+
if (attachMenuBots.bots.get(i).bot_id == id) {
7243+
return true;
7244+
}
7245+
}
7246+
return false;
7247+
}
7248+
72367249
//---------------- BOT END ----------------
72377250

72387251
//---------------- EMOJI START ----------------

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3604,7 +3604,15 @@ private void updateMessageText(AbstractMap<Long, TLRPC.User> users, AbstractMap<
36043604
}
36053605
if (object == null && chats != null) {
36063606
object = chats.get(action.auto_setting_from);
3607-
} else {
3607+
}
3608+
if (object == null) {
3609+
if (action.auto_setting_from > 0) {
3610+
object = MessagesController.getInstance(currentAccount).getUser(action.auto_setting_from);
3611+
} else {
3612+
object = MessagesController.getInstance(currentAccount).getChat(-action.auto_setting_from);
3613+
}
3614+
}
3615+
if (object == null) {
36083616
object = fromObject;
36093617
}
36103618
messageText = replaceWithLink(AndroidUtilities.replaceTags(LocaleController.formatString("AutoDeleteGlobalAction", R.string.AutoDeleteGlobalAction, LocaleController.formatTTLString(action.period))), "un1", object);

‎TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10561,7 +10561,6 @@ public void drawLinkPreview(Canvas canvas, float alpha) {
1056110561
startY = textY + currentMessageObject.textHeight + AndroidUtilities.dp(8);
1056210562
linkX = unmovedTextX + AndroidUtilities.dp(1);
1056310563
}
10564-
startY += (int) transitionParams.deltaBottom;
1056510564
int linkPreviewY = startY;
1056610565
int smallImageStartY = 0;
1056710566

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
423423
private SimpleTextView mentiondownButtonCounter;
424424
private ImageView mentiondownButtonImage;
425425
private Bulletin messageSeenPrivacyBulletin;
426+
TextView webBotTitle;
426427

427428
private int reactionsMentionCount;
428429
private FrameLayout reactionsMentiondownButton;
@@ -1198,6 +1199,17 @@ public void updateMessages(ArrayList<MessageObject> messageObjects, boolean repl
11981199
}
11991200
}
12001201

1202+
public TextView getOrCreateWebBotTitleView() {
1203+
if (webBotTitle == null) {
1204+
webBotTitle = new TextView(getContext());
1205+
webBotTitle.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
1206+
webBotTitle.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
1207+
webBotTitle.setGravity(Gravity.CENTER_VERTICAL);
1208+
actionBar.addView(webBotTitle, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, 0, 72, 0, 72, 0));
1209+
}
1210+
return webBotTitle;
1211+
}
1212+
12011213
private interface ChatActivityDelegate {
12021214
default void openReplyMessage(int mid) {
12031215

@@ -13460,6 +13472,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
1346013472
setMeasuredDimension(widthSize, heightSize);
1346113473
heightSize -= getPaddingTop();
1346213474

13475+
if (webBotTitle != null) {
13476+
((LayoutParams) webBotTitle.getLayoutParams()).topMargin = AndroidUtilities.statusBarHeight;
13477+
webBotTitle.setTextSize(!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 18 : 20);
13478+
}
1346313479
measureChildWithMargins(actionBar, widthMeasureSpec, 0, heightMeasureSpec, 0);
1346413480
int actionBarHeight = actionBar.getMeasuredHeight();
1346513481
if (actionBar.getVisibility() == VISIBLE) {
@@ -14762,6 +14778,11 @@ public void sendButtonPressed(int index, VideoEditedInfo videoEditedInfo, boolea
1476214778
public boolean canScrollAway() {
1476314779
return false;
1476414780
}
14781+
14782+
@Override
14783+
public boolean canCaptureMorePhotos() {
14784+
return false;
14785+
}
1476514786
}, this);
1476614787
} else {
1476714788
fillEditingMediaWithCaption(caption, null);
@@ -24613,7 +24634,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
2461324634
didPressMessageUrl(link, false, selectedObject, v instanceof ChatMessageCell ? (ChatMessageCell) v : null);
2461424635
return true;
2461524636
};
24616-
TLRPC.InputPeer inputPeer = selectedObject != null && (selectedObject.isPoll() || selectedObject.isVoiceTranscriptionOpen() || selectedObject.isSponsored()) ? null : getMessagesController().getInputPeer(dialog_id);
24637+
TLRPC.InputPeer inputPeer = selectedObject != null && (selectedObject.isPoll() || selectedObject.isVoiceTranscriptionOpen() || selectedObject.isSponsored() || selectedObject.scheduled) ? null : getMessagesController().getInputPeer(dialog_id);
2461724638
if (selectedObject != null && selectedObject.messageOwner != null && selectedObject.messageOwner.originalLanguage != null) {
2461824639
waitForLangDetection.set(false);
2461924640
String fromLang = selectedObject.messageOwner.originalLanguage;

‎TMessagesProj/src/main/java/org/telegram/ui/Components/BotWebViewContainer.java‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,14 @@
4949
import org.json.JSONException;
5050
import org.json.JSONObject;
5151
import org.json.JSONTokener;
52-
import org.telegram.PhoneFormat.PhoneFormat;
5352
import org.telegram.messenger.AndroidUtilities;
5453
import org.telegram.messenger.ApplicationLoader;
5554
import org.telegram.messenger.BotWebViewVibrationEffect;
56-
import org.telegram.messenger.ContactsController;
5755
import org.telegram.messenger.FileLog;
5856
import org.telegram.messenger.ImageLocation;
5957
import org.telegram.messenger.ImageReceiver;
6058
import org.telegram.messenger.LocaleController;
6159
import org.telegram.messenger.MediaDataController;
62-
import org.telegram.messenger.MessageObject;
6360
import org.telegram.messenger.MessagesController;
6461
import org.telegram.messenger.NotificationCenter;
6562
import org.telegram.messenger.R;
@@ -1214,20 +1211,28 @@ public void didReceivedNotification(int id, int account, Object... args) {
12141211
case "web_app_set_header_color": {
12151212
try {
12161213
JSONObject jsonObject = new JSONObject(eventData);
1217-
String key = jsonObject.getString("color_key");
1218-
int themeKey = -1;
1219-
switch (key) {
1220-
case "bg_color": {
1221-
themeKey = Theme.key_windowBackgroundWhite;
1222-
break;
1214+
String overrideColorString = jsonObject.optString("color", null);
1215+
if (!TextUtils.isEmpty(overrideColorString)) {
1216+
int color = Color.parseColor(overrideColorString);
1217+
if (color != 0) {
1218+
delegate.onWebAppSetActionBarColor(color, true);
12231219
}
1224-
case "secondary_bg_color": {
1225-
themeKey = Theme.key_windowBackgroundGray;
1226-
break;
1220+
} else {
1221+
String key = jsonObject.optString("color_key");
1222+
int themeKey = -1;
1223+
switch (key) {
1224+
case "bg_color": {
1225+
themeKey = Theme.key_windowBackgroundWhite;
1226+
break;
1227+
}
1228+
case "secondary_bg_color": {
1229+
themeKey = Theme.key_windowBackgroundGray;
1230+
break;
1231+
}
1232+
}
1233+
if (themeKey >= 0) {
1234+
delegate.onWebAppSetActionBarColor(Theme.getColor(themeKey, resourcesProvider), false);
12271235
}
1228-
}
1229-
if (themeKey >= 0) {
1230-
delegate.onWebAppSetActionBarColor(themeKey);
12311236
}
12321237
} catch (JSONException e) {
12331238
FileLog.e(e);
@@ -1763,8 +1768,9 @@ default void onSendWebViewData(String data) {}
17631768
* Called when WebView requests to set action bar color
17641769
*
17651770
* @param colorKey Color theme key
1771+
* @param isOverrideColor
17661772
*/
1767-
void onWebAppSetActionBarColor(int colorKey);
1773+
void onWebAppSetActionBarColor(int colorKey, boolean isOverrideColor);
17681774

17691775
/**
17701776
* Called when WebView requests to set background color

0 commit comments

Comments
 (0)