Merge upstream 7.7.2 (2293)

# Conflicts: # TMessagesProj/build.gradle # TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java
NextAlone · Apr 17, 2021 · ec6ae15 · ec6ae15
2 parents 6e80a66 + a5939cc
commit ec6ae15
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
@@ -3,15 +3,15 @@ import cn.hutool.core.util.RuntimeUtil
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
-def verName = "7.7.1-preview04"
+def verName = "7.7.2-rc01"
 def verCode = 290 + 3 * 1
 
 if (System.getenv("DEBUG_BUILD") == "true") {
     verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)")
 }
 
-def officialVer = "7.7.1"
-def officialCode = 2291
+def officialVer = "7.7.2"
+def officialCode = 2293
 
 def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
 

diff --git a/TMessagesProj/jni/audio.c b/TMessagesProj/jni/audio.c
@@ -219,7 +219,7 @@ static int writeOggPage(ogg_page *page, FILE *os) {
     return written;
 }
 
-const opus_int32 bitrate = 25000;
+const opus_int32 bitrate = 30 * 1024;
 const opus_int32 frame_size = 960;
 const int with_cvbr = 1;
 const int max_ogg_delay = 0;

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java b/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java
@@ -1318,8 +1318,11 @@ public String formatCurrencyString(long amount, boolean fixAnything, boolean wit
             }
             String result = (discount ? "-" : "") + format.format(doubleAmount);
             int idx = result.indexOf(type);
-            if (idx >= 0 && result.charAt(idx + type.length()) != ' ') {
-                result = result.substring(0, idx + type.length()) + " " + result.substring(idx + type.length());
+            if (idx >= 0) {
+                idx += type.length();
+                if (idx < result.length() && result.charAt(idx + type.length()) != ' ') {
+                    result = result.substring(0, idx + type.length()) + " " + result.substring(idx + type.length());
+                }
             }
             return result;
         }

diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
@@ -6713,14 +6713,18 @@ public Runnable getMessagesInternal(long dialogId, long mergeDialogId, int count
                     }
                     cursor.dispose();
                 }
-                if (messageIdsToFix != null) { //TODO remove later
+                if (messageIdsToFix != null) {
                     SQLitePreparedStatement state = database.executeFast("UPDATE messages SET mid = ? WHERE mid = ?");
-                    for (int a = 0, N = messageIdsToFix.size(); a < N; a++) {
-                        long id = messageIdsToFix.get(a);
-                        state.requery();
-                        state.bindLong(1, (int) id);
-                        state.bindLong(2, id);
-                        state.step();
+                    try {
+                        for (int a = 0, N = messageIdsToFix.size(); a < N; a++) {
+                            long id = messageIdsToFix.get(a);
+                            state.requery();
+                            state.bindLong(1, (int) id);
+                            state.bindLong(2, id);
+                            state.step();
+                        }
+                    } catch (Exception e) {
+                        FileLog.e(e);
                     }
                     state.dispose();
                 }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -18385,7 +18385,7 @@ public void onPause() {
         CharSequence draftMessage = null;
         MessageObject replyMessage = null;
         boolean searchWebpage = true;
-        if (!ignoreAttachOnPause && chatActivityEnterView != null && bottomOverlayChat.getVisibility() != View.VISIBLE) {
+        if (!ignoreAttachOnPause && chatActivityEnterView != null && bottomOverlayChat != null && bottomOverlayChat.getVisibility() != View.VISIBLE) {
             chatActivityEnterView.onPause();
             replyMessage = replyingMessageObject;
             if (!chatActivityEnterView.isEditingMessage()) {