Update to 5.13.1 (1824)

TMessagesProj/build.gradle

@@ -283,7 +283,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 1823
+    defaultConfig.versionCode = 1824
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
@@ -318,7 +318,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionName "5.13.0"
+        versionName "5.13.1"
 
         vectorDrawables.generatedDensities = ['mdpi', 'hdpi', 'xhdpi', 'xxhdpi']
 

TMessagesProj/jni/libtgvoip/os/posix/NetworkSocketPosix.cpp

@@ -521,7 +521,7 @@ bool NetworkSocketPosix::Select(std::vector<NetworkSocket *> &readFds, std::vect
 
 	for(NetworkSocket*& s:readFds){
 		int sfd=GetDescriptorFromSocket(s);
-		if(sfd==0){
+		if(sfd<=0){
 			LOGW("can't select on one of sockets because it's not a NetworkSocketPosix instance");
 			continue;
 		}
@@ -532,7 +532,7 @@ bool NetworkSocketPosix::Select(std::vector<NetworkSocket *> &readFds, std::vect
 
 	for(NetworkSocket*& s:writeFds){
 		int sfd=GetDescriptorFromSocket(s);
-		if(sfd==0){
+		if(sfd<=0){
 			LOGW("can't select on one of sockets because it's not a NetworkSocketPosix instance");
 			continue;
 		}
@@ -545,7 +545,7 @@ bool NetworkSocketPosix::Select(std::vector<NetworkSocket *> &readFds, std::vect
 
 	for(NetworkSocket*& s:errorFds){
 		int sfd=GetDescriptorFromSocket(s);
-		if(sfd==0){
+		if(sfd<=0){
 			LOGW("can't select on one of sockets because it's not a NetworkSocketPosix instance");
 			continue;
 		}
@@ -571,13 +571,14 @@ bool NetworkSocketPosix::Select(std::vector<NetworkSocket *> &readFds, std::vect
 	}
 
 	std::vector<NetworkSocket*>::iterator itr=readFds.begin();
-	while(itr!=readFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if(FD_ISSET(sfd, &readSet))
-			(*itr)->lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-		if(sfd==0 || !FD_ISSET(sfd, &readSet) || !(*itr)->OnReadyToReceive()){
-			itr=readFds.erase(itr);
-		}else{
+	while (itr != readFds.end()) {
+		int sfd = GetDescriptorFromSocket(*itr);
+		if (sfd > 0 && FD_ISSET(sfd, &readSet)) {
+			(*itr)->lastSuccessfulOperationTime = VoIPController::GetCurrentTime();
+		}
+		if (sfd == 0 || !FD_ISSET(sfd, &readSet) || !(*itr)->OnReadyToReceive()) {
+			itr = readFds.erase(itr);
+		} else {
 			++itr;
 		}
 	}

TMessagesProj/jni/lottie.cpp

@@ -55,6 +55,7 @@ jlong Java_org_telegram_ui_Components_RLottieDrawable_create(JNIEnv *env, jclass
     LottieInfo *info = new LottieInfo();
 
     std::map<int32_t, int32_t> *colors = nullptr;
+    int color = 0;
     if (colorReplacement != nullptr) {
         jint *arr = env->GetIntArrayElements(colorReplacement, 0);
         if (arr != nullptr) {
@@ -62,6 +63,9 @@ jlong Java_org_telegram_ui_Components_RLottieDrawable_create(JNIEnv *env, jclass
             colors = new std::map<int32_t, int32_t>();
             for (int32_t a = 0; a < len / 2; a++) {
                 (*colors)[arr[a * 2]] = arr[a * 2 + 1];
+                if (color == 0) {
+                    color = arr[a * 2 + 1];
+                }
             }
             env->ReleaseIntArrayElements(colorReplacement, arr, 0);
         }
@@ -93,10 +97,14 @@ jlong Java_org_telegram_ui_Components_RLottieDrawable_create(JNIEnv *env, jclass
             mkdir(dir.c_str(), 0777);
             info->cacheFile.insert(index, "/acache");
         }
+        info->cacheFile += std::to_string(w) + "_" + std::to_string(h);
+        if (color != 0) {
+            info->cacheFile += "_" + std::to_string(color);
+        }
         if (limitFps) {
-            info->cacheFile += std::to_string(w) + "_" + std::to_string(h) + ".s.cache";
+            info->cacheFile += ".s.cache";
         } else {
-            info->cacheFile += std::to_string(w) + "_" + std::to_string(h) + ".cache";
+            info->cacheFile += ".cache";
         }
         FILE *precacheFile = fopen(info->cacheFile.c_str(), "r+");
         if (precacheFile == nullptr) {