OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 14:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

update to 9.1.1

Browse source
This commit is contained in:
xaxtix 2022-11-06 06:42:06 +04:00
parent 342e681114
commit a2981ddd29
3 changed files with 68 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
View file

@ -24,8 +24,8 @@ public class BuildVars {
public static boolean USE_CLOUD_STRINGS = true; public static boolean USE_CLOUD_STRINGS = true;
public static boolean CHECK_UPDATES = true; public static boolean CHECK_UPDATES = true;
public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29; public static boolean NO_SCOPED_STORAGE = Build.VERSION.SDK_INT <= 29;
public static int BUILD_VERSION = 2885; public static int BUILD_VERSION = 2900;
public static String BUILD_VERSION_STRING = "9.1.0"; public static String BUILD_VERSION_STRING = "9.1.1";
public static int APP_ID = 4; public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

49
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file

@ -62,6 +62,7 @@ import org.telegram.ui.EditWidgetActivity;
import org.telegram.ui.LaunchActivity; import org.telegram.ui.LaunchActivity;
import org.telegram.ui.PremiumPreviewFragment; import org.telegram.ui.PremiumPreviewFragment;
import org.telegram.ui.ProfileActivity; import org.telegram.ui.ProfileActivity;
import org.telegram.ui.TopicsFragment;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -587,7 +588,7 @@ public class MessagesController extends BaseController implements NotificationCe
if (topics != null) { if (topics != null) {
for (int i = 0; i < topics.size(); i++) { for (int i = 0; i < topics.size(); i++) {
TLRPC.TL_forumTopic topic = topics.get(i); TLRPC.TL_forumTopic topic = topics.get(i);
getMessagesController().markDialogAsRead(did, topic.top_message, 0, topic.topMessage.date, false, topic.id, 0, true, 0); getMessagesController().markDialogAsRead(did, topic.top_message, 0, topic.topMessage != null ? topic.topMessage.date : 0, false, topic.id, 0, true, 0);
getMessagesStorage().updateRepliesMaxReadId(-did, topic.id, topic.top_message, 0, true); getMessagesStorage().updateRepliesMaxReadId(-did, topic.id, topic.top_message, 0, true);
} }
} }
@ -3705,9 +3706,25 @@ public class MessagesController extends BaseController implements NotificationCe
if (oldUser != null && !TextUtils.isEmpty(oldUser.username)) { if (oldUser != null && !TextUtils.isEmpty(oldUser.username)) {
objectsByUsernames.remove(oldUser.username.toLowerCase()); objectsByUsernames.remove(oldUser.username.toLowerCase());
} }
if (oldUser != null && oldUser.usernames != null) {
for (int i = 0; i < oldUser.usernames.size(); ++i) {
TLRPC.TL_username u = oldUser.usernames.get(i);
if (u != null && u.username != null) {
objectsByUsernames.remove(u.username.toLowerCase());
}
}
}
if (!TextUtils.isEmpty(user.username)) { if (!TextUtils.isEmpty(user.username)) {
objectsByUsernames.put(user.username.toLowerCase(), user); objectsByUsernames.put(user.username.toLowerCase(), user);
} }
if (user != null && user.usernames != null) {
for (int i = 0; i < user.usernames.size(); ++i) {
TLRPC.TL_username u = user.usernames.get(i);
if (u != null && u.username != null && u.active) {
objectsByUsernames.put(u.username.toLowerCase(), user);
}
}
}
updateEmojiStatusUntilUpdate(user.id, user.emoji_status); updateEmojiStatusUntilUpdate(user.id, user.emoji_status);
if (user.min) { if (user.min) {
if (oldUser != null) { if (oldUser != null) {
@ -3813,7 +3830,7 @@ public class MessagesController extends BaseController implements NotificationCe
if (chat.usernames != null) { if (chat.usernames != null) {
for (int i = 0; i < chat.usernames.size(); ++i) { for (int i = 0; i < chat.usernames.size(); ++i) {
TLRPC.TL_username u = chat.usernames.get(i); TLRPC.TL_username u = chat.usernames.get(i);
if (u != null && !TextUtils.isEmpty(u.username)) { if (u != null && !TextUtils.isEmpty(u.username) && u.active) {
objectsByUsernames.put(u.username.toLowerCase(), chat); objectsByUsernames.put(u.username.toLowerCase(), chat);
} }
} }
@ -4397,12 +4414,12 @@ public class MessagesController extends BaseController implements NotificationCe
fullUsers.put(user.id, userFull); fullUsers.put(user.id, userFull);
loadingFullUsers.remove(user.id); loadingFullUsers.remove(user.id);
loadedFullUsers.add(user.id); loadedFullUsers.add(user.id);
String names = user.first_name + user.last_name + user.username; String names = user.first_name + user.last_name + UserObject.getPublicUsername(user);
ArrayList<TLRPC.User> users = new ArrayList<>(); ArrayList<TLRPC.User> users = new ArrayList<>();
users.add(userFull.user); users.add(userFull.user);
putUsers(users, false); putUsers(users, false);
getMessagesStorage().putUsersAndChats(users, null, false, true); getMessagesStorage().putUsersAndChats(users, null, false, true);
if (!names.equals(userFull.user.first_name + userFull.user.last_name + userFull.user.username)) { if (!names.equals(userFull.user.first_name + userFull.user.last_name + UserObject.getPublicUsername(userFull.user))) {
getNotificationCenter().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_NAME); getNotificationCenter().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_NAME);
} }
if (userFull.user.photo != null && userFull.user.photo.has_video) { if (userFull.user.photo != null && userFull.user.photo.has_video) {
@ -6225,6 +6242,16 @@ public class MessagesController extends BaseController implements NotificationCe
getMessagesStorage().loadUserInfo(user, force, classGuid, fromMessageId); getMessagesStorage().loadUserInfo(user, force, classGuid, fromMessageId);
} }
public void updateUsernameActiveness(TLObject object, String username, boolean active) {
if (TextUtils.isEmpty(username)) {
return;
}
objectsByUsernames.remove(username);
if (active) {
objectsByUsernames.put(username.toLowerCase(), object);
}
}
public void processUserInfo(TLRPC.User user, TLRPC.UserFull info, boolean fromCache, boolean force, int classGuid, ArrayList<Integer> pinnedMessages, HashMap<Integer, MessageObject> pinnedMessagesMap, int totalPinnedCount, boolean pinnedEndReached) { public void processUserInfo(TLRPC.User user, TLRPC.UserFull info, boolean fromCache, boolean force, int classGuid, ArrayList<Integer> pinnedMessages, HashMap<Integer, MessageObject> pinnedMessagesMap, int totalPinnedCount, boolean pinnedEndReached) {
AndroidUtilities.runOnUIThread(() -> { AndroidUtilities.runOnUIThread(() -> {
if (fromCache) { if (fromCache) {
@ -7203,7 +7230,7 @@ public class MessagesController extends BaseController implements NotificationCe
private void loadMessagesInternal(long dialogId, long mergeDialogId, boolean loadInfo, int count, int max_id, int offset_date, boolean fromCache, int minDate, int classGuid, int load_type, int last_message_id, int mode, int threadMessageId, int loadIndex, int first_unread, int unread_count, int last_date, boolean queryFromServer, int mentionsCount, boolean loadDialog, boolean processMessages, boolean isTopic) { private void loadMessagesInternal(long dialogId, long mergeDialogId, boolean loadInfo, int count, int max_id, int offset_date, boolean fromCache, int minDate, int classGuid, int load_type, int last_message_id, int mode, int threadMessageId, int loadIndex, int first_unread, int unread_count, int last_date, boolean queryFromServer, int mentionsCount, boolean loadDialog, boolean processMessages, boolean isTopic) {
if (BuildVars.LOGS_ENABLED) { if (BuildVars.LOGS_ENABLED) {
FileLog.d("load messages in chat " + dialogId + " count " + count + " max_id " + max_id + " cache " + fromCache + " mindate = " + minDate + " guid " + classGuid + " load_type " + load_type + " last_message_id " + last_message_id + " mode " + mode + " index " + loadIndex + " firstUnread " + first_unread + " unread_count " + unread_count + " last_date " + last_date + " queryFromServer " + queryFromServer + " isTopic " + isTopic); FileLog.d("load messages in chat " + dialogId + " topic_id " + threadMessageId + " count " + count + " max_id " + max_id + " cache " + fromCache + " mindate = " + minDate + " guid " + classGuid + " load_type " + load_type + " last_message_id " + last_message_id + " mode " + mode + " index " + loadIndex + " firstUnread " + first_unread + " unread_count " + unread_count + " last_date " + last_date + " queryFromServer " + queryFromServer + " isTopic " + isTopic);
} }
if ((threadMessageId == 0 || isTopic) && mode != 2 && (fromCache || DialogObject.isEncryptedDialog(dialogId))) { if ((threadMessageId == 0 || isTopic) && mode != 2 && (fromCache || DialogObject.isEncryptedDialog(dialogId))) {
getMessagesStorage().getMessages(dialogId, mergeDialogId, loadInfo, count, max_id, offset_date, minDate, classGuid, load_type, mode == 1, threadMessageId, loadIndex, processMessages, isTopic); getMessagesStorage().getMessages(dialogId, mergeDialogId, loadInfo, count, max_id, offset_date, minDate, classGuid, load_type, mode == 1, threadMessageId, loadIndex, processMessages, isTopic);
@ -7435,7 +7462,7 @@ public class MessagesController extends BaseController implements NotificationCe
public void processLoadedMessages(TLRPC.messages_Messages messagesRes, int resCount, long dialogId, long mergeDialogId, int count, int max_id, int offset_date, boolean isCache, int classGuid, public void processLoadedMessages(TLRPC.messages_Messages messagesRes, int resCount, long dialogId, long mergeDialogId, int count, int max_id, int offset_date, boolean isCache, int classGuid,
int first_unread, int last_message_id, int unread_count, int last_date, int load_type, boolean isEnd, int mode, int threadMessageId, int loadIndex, boolean queryFromServer, int mentionsCount, boolean needProcess, boolean isTopic) { int first_unread, int last_message_id, int unread_count, int last_date, int load_type, boolean isEnd, int mode, int threadMessageId, int loadIndex, boolean queryFromServer, int mentionsCount, boolean needProcess, boolean isTopic) {
if (BuildVars.LOGS_ENABLED) { if (BuildVars.LOGS_ENABLED) {
FileLog.d("processLoadedMessages size " + messagesRes.messages.size() + " in chat " + dialogId + " count " + count + " max_id " + max_id + " cache " + isCache + " guid " + classGuid + " load_type " + load_type + " last_message_id " + last_message_id + " index " + loadIndex + " firstUnread " + first_unread + " unread_count " + unread_count + " last_date " + last_date + " queryFromServer " + queryFromServer + " isTopic" + isTopic); FileLog.d("processLoadedMessages size " + messagesRes.messages.size() + " in chat " + dialogId + " topic_id " + threadMessageId + " count " + count + " max_id " + max_id + " cache " + isCache + " guid " + classGuid + " load_type " + load_type + " last_message_id " + last_message_id + " index " + loadIndex + " firstUnread " + first_unread + " unread_count " + unread_count + " last_date " + last_date + " queryFromServer " + queryFromServer + " isTopic" + isTopic);
} }
long startProcessTime = SystemClock.elapsedRealtime(); long startProcessTime = SystemClock.elapsedRealtime();
@ -14465,7 +14492,7 @@ public class MessagesController extends BaseController implements NotificationCe
} }
for (int i = 0; i < update.usernames.size(); ++i) { for (int i = 0; i < update.usernames.size(); ++i) {
String username = update.usernames.get(i).username; String username = update.usernames.get(i).username;
if (!TextUtils.isEmpty(username)) { if (!TextUtils.isEmpty(username) && update.usernames.get(i).active) {
objectsByUsernames.put(username, currentUser); objectsByUsernames.put(username, currentUser);
} }
} }
@ -16398,12 +16425,20 @@ public class MessagesController extends BaseController implements NotificationCe
if (type == 0) { if (type == 0) {
fragment.presentFragment(new ProfileActivity(args)); fragment.presentFragment(new ProfileActivity(args));
} else if (type == 2) { } else if (type == 2) {
if (ChatObject.isForum(chat)) {
fragment.presentFragment(new TopicsFragment(args), true, true);
} else {
fragment.presentFragment(new ChatActivity(args), true, true); fragment.presentFragment(new ChatActivity(args), true, true);
}
} else {
if (ChatObject.isForum(chat)) {
fragment.presentFragment(new TopicsFragment(args), closeLast);
} else { } else {
fragment.presentFragment(new ChatActivity(args), closeLast); fragment.presentFragment(new ChatActivity(args), closeLast);
} }
} }
} }
}
public void openByUserName(String username, BaseFragment fragment, int type) { public void openByUserName(String username, BaseFragment fragment, int type) {
if (username == null || fragment == null) { if (username == null || fragment == null) {

41
TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
View file

@ -505,25 +505,25 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
@Override @Override
public void onResume() { public void onResume() {
if (transitionAnimationInProgress) { // if (transitionAnimationInProgress) {
if (currentAnimation != null) { // if (currentAnimation != null) {
currentAnimation.cancel(); // currentAnimation.cancel();
currentAnimation = null; // currentAnimation = null;
} // }
if (animationRunnable != null) { // if (animationRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(animationRunnable); // AndroidUtilities.cancelRunOnUIThread(animationRunnable);
animationRunnable = null; // animationRunnable = null;
} // }
if (waitingForKeyboardCloseRunnable != null) { // if (waitingForKeyboardCloseRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(waitingForKeyboardCloseRunnable); // AndroidUtilities.cancelRunOnUIThread(waitingForKeyboardCloseRunnable);
waitingForKeyboardCloseRunnable = null; // waitingForKeyboardCloseRunnable = null;
} // }
if (onCloseAnimationEndRunnable != null) { // if (onCloseAnimationEndRunnable != null) {
onCloseAnimationEnd(); // onCloseAnimationEnd();
} else if (onOpenAnimationEndRunnable != null) { // } else if (onOpenAnimationEndRunnable != null) {
onOpenAnimationEnd(); // onOpenAnimationEnd();
} // }
} // }
if (!fragmentsStack.isEmpty()) { if (!fragmentsStack.isEmpty()) {
BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1); BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 1);
lastFragment.onResume(); lastFragment.onResume();
@ -2175,6 +2175,9 @@ public class ActionBarLayout extends FrameLayout implements INavigationLayout, F
private void onCloseAnimationEnd() { private void onCloseAnimationEnd() {
if (transitionAnimationInProgress && onCloseAnimationEndRunnable != null) { if (transitionAnimationInProgress && onCloseAnimationEndRunnable != null) {
if (currentAnimation != null) {
currentAnimation.cancel();
}
transitionAnimationInProgress = false; transitionAnimationInProgress = false;
layoutToIgnore = null; layoutToIgnore = null;
transitionAnimationPreviewMode = false; transitionAnimationPreviewMode = false;