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 5.14.0 (1849)

Browse source
This commit is contained in:
DrKLO 2020-01-23 17:57:54 +03:00
parent 207ef50ce6
commit c623952aa2
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/build.gradle
View file

@ -283,7 +283,7 @@ android {
} }
} }
defaultConfig.versionCode = 1848 defaultConfig.versionCode = 1849
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.all { output -> variant.outputs.all { output ->

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

@ -19,7 +19,7 @@ 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 TON_WALLET_STANDALONE = false; public static boolean TON_WALLET_STANDALONE = false;
public static int BUILD_VERSION = 1848; public static int BUILD_VERSION = 1849;
public static String BUILD_VERSION_STRING = "5.14.0"; public static String BUILD_VERSION_STRING = "5.14.0";
public static int APP_ID = 4; public static int APP_ID = 4;
public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103"; public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

16
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View file

@ -2960,11 +2960,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
holder = chatListView.findViewHolderForAdapterPosition(prevPosition); holder = chatListView.findViewHolderForAdapterPosition(prevPosition);
if (holder != null) { if (holder != null) {
top = holder.itemView.getTop(); top = holder.itemView.getTop();
if (y - AndroidUtilities.dp(48) < holder.itemView.getBottom()) {
tx = Math.min(holder.itemView.getTranslationX(), tx);
}
if (holder.itemView instanceof ChatMessageCell) { if (holder.itemView instanceof ChatMessageCell) {
cell = (ChatMessageCell) holder.itemView; cell = (ChatMessageCell) holder.itemView;
if (y - AndroidUtilities.dp(48) < holder.itemView.getBottom()) {
//tx = Math.min(cell.getTranslationX(), tx);
}
if (!cell.isPinnedTop()) { if (!cell.isPinnedTop()) {
break; break;
} }
@ -10305,6 +10305,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
dayArray.add(0, obj); dayArray.add(0, obj);
if (chatAdapter != null && placeToPaste >= 0 && placeToPaste < messages.size()) {
MessageObject prevMessage = messages.get(placeToPaste);
if (prevMessage.hasValidGroupId() && prevMessage.getGroupId() != obj.getGroupId()) {
MessageObject.GroupedMessages group = groupedMessagesMap.get(prevMessage.getGroupId());
if (group != null && group.messages.size() > 1) {
int size = group.messages.size();
chatAdapter.notifyItemRangeChanged(1, size - 1);
}
}
}
messages.add(placeToPaste, obj); messages.add(placeToPaste, obj);
if (chatAdapter != null) { if (chatAdapter != null) {
chatAdapter.notifyItemChanged(placeToPaste); chatAdapter.notifyItemChanged(placeToPaste);

2
TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
View file

@ -1012,7 +1012,7 @@ public class ThemeActivity extends BaseFragment implements NotificationCenter.No
} }
int fontSize = AndroidUtilities.isTablet() ? 18 : 16; int fontSize = AndroidUtilities.isTablet() ? 18 : 16;
Theme.ThemeInfo currentTheme = Theme.getCurrentTheme(); Theme.ThemeInfo currentTheme = Theme.getCurrentTheme();
if (SharedConfig.fontSize != fontSize || SharedConfig.bubbleRadius != 6 || !currentTheme.firstAccentIsDefault || currentTheme.currentAccentId != Theme.DEFALT_THEME_ACCENT_ID) { if (SharedConfig.fontSize != fontSize || SharedConfig.bubbleRadius != 10 || !currentTheme.firstAccentIsDefault || currentTheme.currentAccentId != Theme.DEFALT_THEME_ACCENT_ID) {
menuItem.showSubItem(reset_settings); menuItem.showSubItem(reset_settings);
} else { } else {
menuItem.hideSubItem(reset_settings); menuItem.hideSubItem(reset_settings);