update to 9.5.5

sachinrathore028 · Mar 24, 2023 · 5e5b765 · 5e5b765
1 parent c06f56d
commit 5e5b765
Show file tree

Hide file tree

Showing 76 changed files with 1,180 additions and 482 deletions.
diff --git a/TMessagesProj/jni/TgNetWrapper.cpp b/TMessagesProj/jni/TgNetWrapper.cpp
@@ -5,6 +5,7 @@
 #include "tgnet/ConnectionsManager.h"
 #include "tgnet/MTProtoScheme.h"
 #include "tgnet/ConnectionSocket.h"
+#include "tgnet/FileLog.h"
 
 JavaVM *java;
 jclass jclass_RequestDelegateInternal;
@@ -96,12 +97,15 @@ void sendRequest(JNIEnv *env, jclass c, jint instanceNum, jlong object, jobject
     TL_api_request *request = new TL_api_request();
     request->request = (NativeByteBuffer *) (intptr_t) object;
     if (onComplete != nullptr) {
+        DEBUG_REF("sendRequest onComplete");
         onComplete = env->NewGlobalRef(onComplete);
     }
     if (onQuickAck != nullptr) {
+        DEBUG_REF("sendRequest onQuickAck");
         onQuickAck = env->NewGlobalRef(onQuickAck);
     }
     if (onWriteToSocket != nullptr) {
+        DEBUG_REF("sendRequest onWriteToSocket");
         onWriteToSocket = env->NewGlobalRef(onWriteToSocket);
     }
     ConnectionsManager::getInstance(instanceNum).sendRequest(request, ([onComplete, instanceNum](TLObject *response, TL_error *error, int32_t networkType, int64_t responseTime, int64_t msgId) {
@@ -238,6 +242,7 @@ jlong checkProxy(JNIEnv *env, jclass c, jint instanceNum, jstring address, jint
     const char *secretStr = env->GetStringUTFChars(secret, 0);
 
     if (requestTimeFunc != nullptr) {
+        DEBUG_REF("sendRequest requestTimeFunc");
         requestTimeFunc = env->NewGlobalRef(requestTimeFunc);
     }
 
@@ -483,7 +488,8 @@ extern "C" int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env) {
     if (!registerNativeMethods(env, ConnectionsManagerClassPathName, ConnectionsManagerMethods, sizeof(ConnectionsManagerMethods) / sizeof(ConnectionsManagerMethods[0]))) {
         return JNI_FALSE;
     }
-
+
+    DEBUG_REF("RequestDelegateInternal class");
     jclass_RequestDelegateInternal = (jclass) env->NewGlobalRef(env->FindClass("org/telegram/tgnet/RequestDelegateInternal"));
     if (jclass_RequestDelegateInternal == 0) {
         return JNI_FALSE;
@@ -493,6 +499,7 @@ extern "C" int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env) {
         return JNI_FALSE;
     }
 
+    DEBUG_REF("RequestTimeDelegate class");
     jclass_RequestTimeDelegate = (jclass) env->NewGlobalRef(env->FindClass("org/telegram/tgnet/RequestTimeDelegate"));
     if (jclass_RequestTimeDelegate == 0) {
         return JNI_FALSE;
@@ -502,6 +509,7 @@ extern "C" int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env) {
         return JNI_FALSE;
     }
 
+    DEBUG_REF("QuickAckDelegate class");
     jclass_QuickAckDelegate = (jclass) env->NewGlobalRef(env->FindClass("org/telegram/tgnet/QuickAckDelegate"));
     if (jclass_RequestDelegateInternal == 0) {
         return JNI_FALSE;
@@ -511,6 +519,7 @@ extern "C" int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env) {
         return JNI_FALSE;
     }
 
+    DEBUG_REF("WriteToSocketDelegate class");
     jclass_WriteToSocketDelegate = (jclass) env->NewGlobalRef(env->FindClass("org/telegram/tgnet/WriteToSocketDelegate"));
     if (jclass_WriteToSocketDelegate == 0) {
         return JNI_FALSE;
@@ -519,6 +528,7 @@ extern "C" int registerNativeTgNetFunctions(JavaVM *vm, JNIEnv *env) {
     if (jclass_WriteToSocketDelegate_run == 0) {
         return JNI_FALSE;
     }
+    DEBUG_REF("ConnectionsManager class");
     jclass_ConnectionsManager = (jclass) env->NewGlobalRef(env->FindClass("org/telegram/tgnet/ConnectionsManager"));
     if (jclass_ConnectionsManager == 0) {
         return JNI_FALSE;

diff --git a/TMessagesProj/jni/gifvideo.cpp b/TMessagesProj/jni/gifvideo.cpp
@@ -121,6 +121,7 @@ typedef struct VideoInfo {
             } else {
                 attached = false;
             }
+            DEBUG_DELREF("gifvideocpp stream");
             jniEnv->DeleteGlobalRef(stream);
             if (attached) {
                 javaVm->DetachCurrentThread();
@@ -955,6 +956,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_telegram_ui_Components_AnimatedFileD
     int ret;
     if (streamFileSize != 0) {
         info->file_size = streamFileSize;
+        DEBUG_REF("gifvideo.cpp new stream");
         info->stream = env->NewGlobalRef(stream);
         info->account = account;
         info->fd = open(info->src, O_RDONLY, S_IRUSR);
@@ -1381,6 +1383,7 @@ extern "C" JNIEXPORT jint JNICALL Java_org_telegram_ui_Components_AnimatedFileDr
 
 extern "C" jint videoOnJNILoad(JavaVM *vm, JNIEnv *env) {
     //av_log_set_callback(custom_log);
+    DEBUG_REF("gifvideo.cpp AnimatedFileDrawableStream ref");
     jclass_AnimatedFileDrawableStream = (jclass) env->NewGlobalRef(env->FindClass("org/telegram/messenger/AnimatedFileDrawableStream"));
     if (jclass_AnimatedFileDrawableStream == 0) {
         return JNI_FALSE;

diff --git a/TMessagesProj/jni/image.cpp b/TMessagesProj/jni/image.cpp
@@ -27,14 +27,17 @@ jfieldID jclass_Options_outHeight;
 jfieldID jclass_Options_outWidth;
 
 jint imageOnJNILoad(JavaVM *vm, JNIEnv *env) {
+    DEBUG_REF("image.cpp nullpointerexception class");
     jclass_NullPointerException = (jclass) env->NewGlobalRef(env->FindClass("java/lang/NullPointerException"));
     if (jclass_NullPointerException == 0) {
         return JNI_FALSE;
     }
+    DEBUG_REF("image.cpp runtimeexception class");
     jclass_RuntimeException = (jclass) env->NewGlobalRef(env->FindClass("java/lang/RuntimeException"));
     if (jclass_RuntimeException == 0) {
         return JNI_FALSE;
     }
+    DEBUG_REF("image.cpp bitmapfactoryoptions class");
     jclass_Options = (jclass) env->NewGlobalRef(env->FindClass("android/graphics/BitmapFactory$Options"));
     if (jclass_Options == 0) {
         return JNI_FALSE;

diff --git a/TMessagesProj/jni/jni.c b/TMessagesProj/jni/jni.c
@@ -274,7 +274,7 @@ JNIEXPORT jlong Java_org_telegram_messenger_Utilities_getLastUsageFileTime(JNIEn
     struct stat attrib;
     stat(fileName, &attrib);
     jlong value;
-    if (attrib.st_atim.tv_sec != 0) {
+    if (attrib.st_atim.tv_sec > 316000000) {
         value = attrib.st_atim.tv_sec;
     } else {
         value = attrib.st_mtim.tv_sec;

diff --git a/TMessagesProj/jni/tgnet/ApiScheme.cpp b/TMessagesProj/jni/tgnet/ApiScheme.cpp
@@ -56,6 +56,7 @@ void TL_dcOption::readParams(NativeByteBuffer *stream, int32_t instanceNum, bool
     cdn = (flags & 8) != 0;
     isStatic = (flags & 16) != 0;
     thisPortOnly = (flags & 32) != 0;
+    force_try_ipv6 = (flags & 16384) != 0;
     id = stream->readInt32(&error);
     ip_address = stream->readString(&error);
     port = stream->readInt32(&error);
@@ -72,6 +73,7 @@ void TL_dcOption::serializeToStream(NativeByteBuffer *stream) {
     flags = cdn ? (flags | 8) : (flags &~ 8);
     flags = isStatic ? (flags | 16) : (flags &~ 16);
     flags = thisPortOnly ? (flags | 32) : (flags &~ 32);
+    flags = force_try_ipv6 ? (flags | 16384) : (flags &~ 16384);
     stream->writeInt32(flags);
     stream->writeInt32(id);
     stream->writeString(ip_address);

diff --git a/TMessagesProj/jni/tgnet/ApiScheme.h b/TMessagesProj/jni/tgnet/ApiScheme.h
@@ -50,6 +50,7 @@ class TL_dcOption : public TLObject {
     bool cdn;
     bool isStatic;
     bool thisPortOnly;
+    bool force_try_ipv6;
     int32_t id;
     std::string ip_address;
     int32_t port;

diff --git a/TMessagesProj/jni/tgnet/ConnectionsManager.cpp b/TMessagesProj/jni/tgnet/ConnectionsManager.cpp
@@ -1825,14 +1825,17 @@ void ConnectionsManager::sendRequest(TLObject *object, onCompleteFunc onComplete
             exit(1);
         }
         if (ptr1 != nullptr) {
+            DEBUG_DELREF("connectionsmanager ptr1");
             env->DeleteGlobalRef(ptr1);
             ptr1 = nullptr;
         }
         if (ptr2 != nullptr) {
+            DEBUG_DELREF("connectionsmanager ptr2");
             env->DeleteGlobalRef(ptr2);
             ptr2 = nullptr;
         }
         if (ptr3 != nullptr) {
+            DEBUG_DELREF("connectionsmanager ptr3");
             env->DeleteGlobalRef(ptr3);
             ptr3 = nullptr;
         }
@@ -3029,12 +3032,14 @@ void ConnectionsManager::updateDcSettings(uint32_t dcNum, bool workaround) {
                 std::vector<TcpAddress> addressesIpv4Download;
                 std::vector<TcpAddress> addressesIpv6Download;
                 bool isCdn = false;
+                bool forceTryIpV6;
 
                 void addAddressAndPort(TL_dcOption *dcOption) {
                     std::vector<TcpAddress> *addresses;
                     if (!isCdn) {
                         isCdn = dcOption->cdn;
                     }
+                    forceTryIpV6 = dcOption->force_try_ipv6;
                     if (dcOption->media_only) {
                         if (dcOption->ipv6) {
                             addresses = &addressesIpv6Download;
@@ -3057,7 +3062,7 @@ void ConnectionsManager::updateDcSettings(uint32_t dcNum, bool workaround) {
                     if (dcOption->secret != nullptr) {
                         secret = std::string((const char *) dcOption->secret->bytes, dcOption->secret->length);
                     }
-                    if (LOGS_ENABLED) DEBUG_D("getConfig add %s:%d to dc%d, flags %d, has_secret = %d[%d], try_this_port_only = %d", dcOption->ip_address.c_str(), dcOption->port, dcOption->id, dcOption->flags, dcOption->secret != nullptr ? 1 : 0, dcOption->secret != nullptr ? dcOption->secret->length : 0, dcOption->thisPortOnly ? 1 : 0);
+                    if (LOGS_ENABLED) DEBUG_D("getConfig add %s:%d to dc%d, flags %d, has_secret = %d[%d], try_this_port_only = %d, force_try_ipv6 = %d", dcOption->ip_address.c_str(), dcOption->port, dcOption->id, dcOption->flags, dcOption->secret != nullptr ? 1 : 0, dcOption->secret != nullptr ? dcOption->secret->length : 0, dcOption->thisPortOnly ? 1 : 0, dcOption->force_try_ipv6 ? 1 : 0);
                     if (dcOption->thisPortOnly) {
                         addresses->insert(addresses->begin(), TcpAddress(dcOption->ip_address, dcOption->port, dcOption->flags, secret));
                     } else {
@@ -3607,6 +3612,7 @@ void ConnectionsManager::useJavaVM(JavaVM *vm, bool useJavaByteBuffers) {
             if (LOGS_ENABLED) DEBUG_E("can't get jnienv");
             exit(1);
         }
+        DEBUG_REF("connectionsmanager byte buffer");
         jclass_ByteBuffer = (jclass) env->NewGlobalRef(env->FindClass("java/nio/ByteBuffer"));
         if (jclass_ByteBuffer == nullptr) {
             if (LOGS_ENABLED) DEBUG_E("can't find java ByteBuffer class");

diff --git a/TMessagesProj/jni/tgnet/FileLog.cpp b/TMessagesProj/jni/tgnet/FileLog.cpp
@@ -22,6 +22,8 @@ bool LOGS_ENABLED = true;
 bool LOGS_ENABLED = false;
 #endif
 
+bool REF_LOGS_ENABLED = false;
+
 FileLog &FileLog::getInstance() {
     static FileLog instance;
     return instance;
@@ -166,3 +168,43 @@ void FileLog::d(const char *message, ...) {
 
     va_end(argptr);
 }
+
+static int refsCount = 0;
+
+void FileLog::ref(const char *message, ...) {
+    if (!REF_LOGS_ENABLED) {
+        return;
+    }
+    va_list argptr;
+    va_start(argptr, message);
+    time_t t = time(0);
+    struct tm *now = localtime(&t);
+    refsCount++;
+#ifdef ANDROID
+    std::ostringstream s;
+    s << refsCount << " refs (+ref): " << message;
+    __android_log_vprint(ANDROID_LOG_VERBOSE, "tgnetREF", s.str().c_str(), argptr);
+    va_end(argptr);
+    va_start(argptr, message);
+#endif
+    va_end(argptr);
+}
+
+void FileLog::delref(const char *message, ...) {
+    if (!REF_LOGS_ENABLED) {
+        return;
+    }
+    va_list argptr;
+    va_start(argptr, message);
+    time_t t = time(0);
+    struct tm *now = localtime(&t);
+    refsCount--;
+#ifdef ANDROID
+    std::ostringstream s;
+    s << refsCount << " refs (-ref): " << message;
+    __android_log_vprint(ANDROID_LOG_VERBOSE, "tgnetREF", s.str().c_str(), argptr);
+    va_end(argptr);
+    va_start(argptr, message);
+#endif
+    va_end(argptr);
+}
diff --git a/TMessagesProj/jni/tgnet/FileLog.h b/TMessagesProj/jni/tgnet/FileLog.h
@@ -19,6 +19,8 @@ class FileLog {
     static void e(const char *message, ...) __attribute__((format (printf, 1, 2)));
     static void w(const char *message, ...) __attribute__((format (printf, 1, 2)));
     static void d(const char *message, ...) __attribute__((format (printf, 1, 2)));
+    static void ref(const char *message, ...) __attribute__((format (printf, 1, 2)));
+    static void delref(const char *message, ...) __attribute__((format (printf, 1, 2)));
 
     static FileLog &getInstance();
 
@@ -34,4 +36,7 @@ extern bool LOGS_ENABLED;
 #define DEBUG_W FileLog::getInstance().w
 #define DEBUG_D FileLog::getInstance().d
 
+#define DEBUG_REF FileLog::getInstance().ref
+#define DEBUG_DELREF FileLog::getInstance().delref
+
 #endif
diff --git a/TMessagesProj/jni/tgnet/NativeByteBuffer.cpp b/TMessagesProj/jni/tgnet/NativeByteBuffer.cpp
@@ -14,6 +14,8 @@
 #include "ConnectionsManager.h"
 #include "BuffersStorage.h"
 
+static int buffersCount = 0;
+
 NativeByteBuffer::NativeByteBuffer(uint32_t size) {
 #ifdef ANDROID
     if (jclass_ByteBuffer != nullptr) {
@@ -27,6 +29,7 @@ NativeByteBuffer::NativeByteBuffer(uint32_t size) {
             if (LOGS_ENABLED) DEBUG_E("can't create javaByteBuffer");
             exit(1);
         }
+        DEBUG_REF("nativebytebuffer");
         jobject globalRef = env->NewGlobalRef(javaByteBuffer);
         env->DeleteLocalRef(javaByteBuffer);
         javaByteBuffer = globalRef;
@@ -43,6 +46,7 @@ NativeByteBuffer::NativeByteBuffer(uint32_t size) {
         if (LOGS_ENABLED) DEBUG_E("can't allocate NativeByteBuffer buffer");
         exit(1);
     }
+
     _limit = _capacity = size;
 }
 
@@ -64,6 +68,7 @@ NativeByteBuffer::~NativeByteBuffer() {
 		    if (LOGS_ENABLED) DEBUG_E("can't get jnienv");
             exit(1);
 	    }
+        DEBUG_DELREF("nativebytebuffer");
         env->DeleteGlobalRef(javaByteBuffer);
         javaByteBuffer = nullptr;
     }
@@ -694,6 +699,7 @@ jobject NativeByteBuffer::getJavaByteBuffer() {
             if (LOGS_ENABLED) DEBUG_E("can't allocate NativeByteBuffer buffer");
             exit(1);
         }
+        DEBUG_REF("nativebytebuffer");
         jobject globalRef = env->NewGlobalRef(javaByteBuffer);
         env->DeleteLocalRef(javaByteBuffer);
         javaByteBuffer = globalRef;

diff --git a/TMessagesProj/jni/tgnet/ProxyCheckInfo.cpp b/TMessagesProj/jni/tgnet/ProxyCheckInfo.cpp
@@ -8,10 +8,12 @@
 
 #include "ProxyCheckInfo.h"
 #include "ConnectionsManager.h"
+#include "FileLog.h"
 
 ProxyCheckInfo::~ProxyCheckInfo() {
 #ifdef ANDROID
     if (ptr1 != nullptr) {
+        DEBUG_DELREF("tgnet (2) request ptr1");
         jniEnv[instanceNum]->DeleteGlobalRef(ptr1);
         ptr1 = nullptr;
     }

diff --git a/TMessagesProj/jni/tgnet/Request.cpp b/TMessagesProj/jni/tgnet/Request.cpp
@@ -13,6 +13,7 @@
 #include "ConnectionsManager.h"
 #include "Datacenter.h"
 #include "Connection.h"
+#include "FileLog.h"
 
 Request::Request(int32_t instance, int32_t token, ConnectionType type, uint32_t flags, uint32_t datacenter, onCompleteFunc completeFunc, onQuickAckFunc quickAckFunc, onWriteToSocketFunc writeToSocketFunc) {
     requestToken = token;
@@ -29,14 +30,17 @@ Request::Request(int32_t instance, int32_t token, ConnectionType type, uint32_t
 Request::~Request() {
 #ifdef ANDROID
     if (ptr1 != nullptr) {
+        DEBUG_DELREF("tgnet request ptr1");
         jniEnv[instanceNum]->DeleteGlobalRef(ptr1);
         ptr1 = nullptr;
     }
     if (ptr2 != nullptr) {
+        DEBUG_DELREF("tgnet request ptr2");
         jniEnv[instanceNum]->DeleteGlobalRef(ptr2);
         ptr2 = nullptr;
     }
     if (ptr3 != nullptr) {
+        DEBUG_DELREF("tgnet request ptr3");
         jniEnv[instanceNum]->DeleteGlobalRef(ptr3);
         ptr3 = nullptr;
     }

diff --git a/TMessagesProj/jni/voip/libtgvoip/os/android/AudioInputAndroid.cpp b/TMessagesProj/jni/voip/libtgvoip/os/android/AudioInputAndroid.cpp
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include "../../logging.h"
 #include "JNIUtilities.h"
+#include "tgnet/FileLog.h"
 
 extern JavaVM* sharedJVM;
 
@@ -25,6 +26,7 @@ AudioInputAndroid::AudioInputAndroid(){
 	jni::DoWithJNI([this](JNIEnv* env){
 		jmethodID ctor=env->GetMethodID(jniClass, "<init>", "(J)V");
 		jobject obj=env->NewObject(jniClass, ctor, (jlong)(intptr_t)this);
+		DEBUG_REF("AudioInputAndroid");
 		javaObject=env->NewGlobalRef(obj);
 
 		env->CallVoidMethod(javaObject, initMethod, 48000, 16, 1, 960*2);
@@ -38,6 +40,7 @@ AudioInputAndroid::~AudioInputAndroid(){
 		MutexGuard guard(mutex);
 		jni::DoWithJNI([this](JNIEnv* env){
 			env->CallVoidMethod(javaObject, releaseMethod);
+			DEBUG_DELREF("AudioInputAndroid");
 			env->DeleteGlobalRef(javaObject);
 			javaObject=NULL;
 		});

diff --git a/TMessagesProj/jni/voip/libtgvoip/os/android/AudioOutputAndroid.cpp b/TMessagesProj/jni/voip/libtgvoip/os/android/AudioOutputAndroid.cpp
@@ -7,6 +7,7 @@
 #include "AudioOutputAndroid.h"
 #include <stdio.h>
 #include "../../logging.h"
+#include "tgnet/FileLog.h"
 
 extern JavaVM* sharedJVM;
 
@@ -30,6 +31,7 @@ AudioOutputAndroid::AudioOutputAndroid(){
 
 	jmethodID ctor=env->GetMethodID(jniClass, "<init>", "(J)V");
 	jobject obj=env->NewObject(jniClass, ctor, (jlong)(intptr_t)this);
+	DEBUG_REF("AudioOutputAndroid");
 	javaObject=env->NewGlobalRef(obj);
 
 	env->CallVoidMethod(javaObject, initMethod, 48000, 16, 1, 960*2);
@@ -50,6 +52,7 @@ AudioOutputAndroid::~AudioOutputAndroid(){
 	}
 
 	env->CallVoidMethod(javaObject, releaseMethod);
+	DEBUG_DELREF("AudioOutputAndroid");
 	env->DeleteGlobalRef(javaObject);
 	javaObject=NULL;