diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 7599c2c22..00614cf61 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -3,8 +3,8 @@ import cn.hutool.core.util.RuntimeUtil apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -def verName = "7.5.0-rc10" -def verCode = 200 + 3 * 9 +def verName = "7.5.0-rc11" +def verCode = 200 + 3 * 10 if (System.getenv("DEBUG_BUILD") == "true") { verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)") @@ -391,9 +391,9 @@ dependencies { implementation 'dnsjava:dnsjava:3.3.1' implementation 'org.dizitart:nitrite:3.4.3' - implementation 'cn.hutool:hutool-core:5.5.9' - implementation 'cn.hutool:hutool-crypto:5.5.9' - implementation 'cn.hutool:hutool-http:5.5.9' + implementation 'cn.hutool:hutool-core:5.6.0' + implementation 'cn.hutool:hutool-crypto:5.6.0' + implementation 'cn.hutool:hutool-http:5.6.0' implementation 'com.jakewharton:process-phoenix:2.0.0' compileOnly 'org.yaml:snakeyaml:1.28' diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java b/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java index b67003882..72bb3082e 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java @@ -1410,6 +1410,9 @@ public class LocaleController { } public static String formatDateChat(long date, boolean checkYear) { + if (getInstance().chatDate == null) { + getInstance().recreateFormatters(); + } try { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java index fcfdf32f1..5a29855da 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java @@ -411,7 +411,7 @@ public class NotificationCenter { } public void postNotificationName(int id, Object... args) { - boolean allowDuringAnimation = id == startAllHeavyOperations || id == stopAllHeavyOperations || id == didReplacedPhotoInMemCache; + boolean allowDuringAnimation = id == startAllHeavyOperations || id == stopAllHeavyOperations || id == didReplacedPhotoInMemCache || id == closeChats; ArrayList expiredIndices = null; if (!allowDuringAnimation && !allowedNotifications.isEmpty()) { int size = allowedNotifications.size(); diff --git a/build.gradle b/build.gradle index 57ea60123..a4b79a08b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1' classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3' classpath 'com.github.triplet.gradle:play-publisher:3.0.0' - classpath 'cn.hutool:hutool-core:5.5.9' + classpath 'cn.hutool:hutool-core:5.6.0' } }