update to 9.6.0

Author: xaxtix

TMessagesProj/jni/CMakeLists.txt

@@ -435,7 +435,7 @@ target_include_directories(breakpad PUBLIC
 #voip
 include(${CMAKE_HOME_DIRECTORY}/voip/CMakeLists.txt)
 
-set(NATIVE_LIB "tmessages.44")
+set(NATIVE_LIB "tmessages.45")
 
 #tmessages
 add_library(${NATIVE_LIB} SHARED

TMessagesProj/jni/ffmpeg/arm64-v8a/libvpx.a

@@ -40,6 +40,7 @@ static const std::string av_make_error_str(int errnum) {
 jclass jclass_AnimatedFileDrawableStream;
 jmethodID jclass_AnimatedFileDrawableStream_read;
 jmethodID jclass_AnimatedFileDrawableStream_cancel;
+jmethodID jclass_AnimatedFileDrawableStream_isCanceled;
 jmethodID jclass_AnimatedFileDrawableStream_isFinishedLoadingFile;
 jmethodID jclass_AnimatedFileDrawableStream_getFinishedFilePath;
 
@@ -792,7 +793,7 @@ int readCallback(void *opaque, uint8_t *buf, int buf_size) {
                     javaVm->DetachCurrentThread();
                 }
                 if (buf_size == 0) {
-                    return AVERROR_EOF;
+                    return AVERROR_EXIT;
                 }
                 int ret = (int) read(info->fd, buf, (size_t) buf_size);
                 if (ret <= 0) {
@@ -1102,7 +1103,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_telegram_ui_Components_AnimatedFileDr
             return;
         }
         int got_frame = 0;
-        int32_t tries = 1000;
+        int32_t tries = 100;
         while (tries > 0) {
             if (info->pkt.size == 0) {
                 ret = av_read_frame(info->fmt_ctx, &info->pkt);
@@ -1235,6 +1236,26 @@ extern "C" JNIEXPORT int JNICALL Java_org_telegram_ui_Components_AnimatedFileDra
         int32_t tries = 1000;
         bool readNextPacket = true;
         while (tries > 0) {
+            if (info->stream != nullptr) {
+                JNIEnv *jniEnv = nullptr;
+                JavaVMAttachArgs jvmArgs;
+                jvmArgs.version = JNI_VERSION_1_6;
+
+                bool attached;
+                if (JNI_EDETACHED == javaVm->GetEnv((void **) &jniEnv, JNI_VERSION_1_6)) {
+                    javaVm->AttachCurrentThread(&jniEnv, &jvmArgs);
+                    attached = true;
+                } else {
+                    attached = false;
+                }
+                jboolean canceled = jniEnv->CallBooleanMethod(info->stream, jclass_AnimatedFileDrawableStream_isCanceled);
+                if (attached) {
+                    javaVm->DetachCurrentThread();
+                }
+                if (canceled) {
+                    return 0;
+                }
+            }
             if (info->pkt.size == 0 && readNextPacket) {
                 ret = av_read_frame(info->fmt_ctx, &info->pkt);
                 if (ret >= 0) {
@@ -1309,6 +1330,26 @@ extern "C" JNIEXPORT jint JNICALL Java_org_telegram_ui_Components_AnimatedFileDr
     int32_t triesCount = preview ? 50 : 6;
     //info->has_decoded_frames = false;
     while (!info->stopped && triesCount != 0) {
+        if (info->stream != nullptr) {
+            JNIEnv *jniEnv = nullptr;
+            JavaVMAttachArgs jvmArgs;
+            jvmArgs.version = JNI_VERSION_1_6;
+
+            bool attached;
+            if (JNI_EDETACHED == javaVm->GetEnv((void **) &jniEnv, JNI_VERSION_1_6)) {
+                javaVm->AttachCurrentThread(&jniEnv, &jvmArgs);
+                attached = true;
+            } else {
+                attached = false;
+            }
+            jboolean canceled = jniEnv->CallBooleanMethod(info->stream, jclass_AnimatedFileDrawableStream_isCanceled);
+            if (attached) {
+                javaVm->DetachCurrentThread();
+            }
+            if (canceled) {
+                return 0;
+            }
+        }
         if (info->pkt.size == 0) {
             ret = av_read_frame(info->fmt_ctx, &info->pkt);
             if (ret >= 0) {
@@ -1400,6 +1441,10 @@ extern "C" jint videoOnJNILoad(JavaVM *vm, JNIEnv *env) {
     if (jclass_AnimatedFileDrawableStream_isFinishedLoadingFile == 0) {
         return JNI_FALSE;
     }
+    jclass_AnimatedFileDrawableStream_isCanceled = env->GetMethodID(jclass_AnimatedFileDrawableStream, "isCanceled", "()Z");
+    if (jclass_AnimatedFileDrawableStream_isCanceled == 0) {
+        return JNI_FALSE;
+    }
     jclass_AnimatedFileDrawableStream_getFinishedFilePath = env->GetMethodID(jclass_AnimatedFileDrawableStream, "getFinishedFilePath", "()Ljava/lang/String;");
     if (jclass_AnimatedFileDrawableStream_getFinishedFilePath == 0) {
         return JNI_FALSE;

TMessagesProj/jni/ffmpeg/armeabi-v7a/libvpx.a

@@ -1297,6 +1297,12 @@ void ConnectionsManager::processServerResponse(TLObject *message, int64_t messag
                                     request->serverFailureCount++;
                                 }
                                 discardResponse = true;
+                            } else if (error->error_code == -504) {
+                                discardResponse = (request->requestFlags & RequestFlagIgnoreFloodWait) == 0;
+                                request->failedByFloodWait = 2;
+                                request->startTime = 0;
+                                request->startTimeMillis = 0;
+                                request->minStartTime = (int32_t) (getCurrentTimeMonotonicMillis() / 1000 + 2);
                             } else if (error->error_code == 420) {
                                 int32_t waitTime = 2;
                                 static std::string floodWait = "FLOOD_WAIT_";

TMessagesProj/jni/ffmpeg/x86/libvpx.a

@@ -79,7 +79,7 @@ avatar_actionBarSelectorGreen=-8684677
 chat_inLoaderSelected=-13394195
 chat_outLocationIcon=-452984833
 avatar_actionBarIconViolet=-8684677
-dialogTextRed=-1682082
+text_RedBold=-1682082
 chat_inBubbleShadow=1981626195
 chat_outAudioProgress=-10907938
 dialogProgressCircle=-12281108
@@ -308,7 +308,6 @@ chat_outMenu=-1862270977
 statisticChartActiveLine=335544320
 chats_secretName=-16734706
 chat_outReplyMediaMessageSelectedText=-1056964609
-chat_reportSpam=-704436
 avatar_subtitleInProfileCyan=-16777216
 chat_serviceText=-1
 chats_attachMessage=-13268780

TMessagesProj/jni/ffmpeg/x86_64/libvpx.a

@@ -118,7 +118,7 @@ avatar_actionBarSelectorGreen=-12758164
 chat_outLocationIcon=-1
 chat_inLoaderSelected=-10445358
 location_liveLocationProgress=-9919529
-dialogTextRed=-1152913
+text_RedBold=-1152913
 chat_inBubbleShadow=838860800
 chat_outAudioProgress=-1
 dialogProgressCircle=-10177041
@@ -132,9 +132,8 @@ dialogLineProgressBackground=-13548718
 chat_inReplyNameText=-8796932
 chat_outAudioPerfomerSelectedText=-4268038
 actionBarActionModeDefaultIcon=-1
-windowBackgroundWhiteRedText4=-3187617
 chat_goDownButtonIcon=-1
-windowBackgroundWhiteRedText5=-1152913
+text_RedRegular=-1152913
 chat_outAudioSelectedProgress=-1
 chat_messageTextOut=-328966
 chat_inInstant=-8796932
@@ -446,9 +445,7 @@ chats_secretName=-9316522
 chat_inMenu=2039722445
 chat_recordVoiceCancel=-9192978
 chat_outReplyMediaMessageSelectedText=-1
-chat_reportSpam=-1481631
 chat_messageTextIn=-328966
-dialogRedIcon=-554801041
 avatar_subtitleInProfileCyan=-7628894
 chats_attachMessage=-8548712
 chat_topPanelBackground=-14602949

TMessagesProj/jni/gifvideo.cpp

@@ -83,7 +83,7 @@ avatar_actionBarSelectorGreen=-8684677
 chat_inLoaderSelected=-13394195
 chat_outLocationIcon=-452984833
 avatar_actionBarIconViolet=-8684677
-dialogTextRed=-1682082
+text_RedBold=-1682082
 chat_inBubbleShadow=1914707
 chat_outAudioProgress=-12155183
 dialogProgressCircle=-12281108
@@ -334,7 +334,6 @@ chat_outMenu=-6500865
 statisticChartActiveLine=335544320
 chats_secretName=-16734706
 chat_outReplyMediaMessageSelectedText=-3676417
-chat_reportSpam=-704436
 avatar_subtitleInProfileCyan=-16777216
 chat_serviceText=-13092808
 chats_attachMessage=-14321214