update to 9.6.1

Author: xaxtix

TMessagesProj/jni/tgnet/ConnectionsManager.cpp

@@ -405,6 +405,9 @@ void ConnectionsManager::loadConfig() {
                     auto datacenter = new Datacenter(instanceNum, buffer);
                     datacenters[datacenter->getDatacenterId()] = datacenter;
                     if (LOGS_ENABLED) DEBUG_D("datacenter(%p) %u loaded (hasAuthKey = %d, 0x%" PRIx64 ")", datacenter, datacenter->getDatacenterId(), (int) datacenter->hasPermanentAuthKey(), datacenter->getPermanentAuthKeyId());
+                    if (datacenter->isCdnDatacenter && !datacenter->hasPermanentAuthKey()) {
+                        datacenter->clearAuthKey(HandshakeTypePerm);
+                    }
                 }
             }
         }
@@ -825,7 +828,7 @@ void ConnectionsManager::onConnectionDataReceived(Connection *connection, Native
                     delegate->onProxyError(instanceNum);
                 }
             } else if (code == -404 && (datacenter->isCdnDatacenter || PFS_ENABLED)) {
-                if (!datacenter->isHandshaking(connection->isMediaConnection)) {
+                if (!datacenter->isHandshaking(connection->isMediaConnection) || datacenter->isCdnDatacenter) {
                     datacenter->clearAuthKey(connection->isMediaConnection ? HandshakeTypeMediaTemp : HandshakeTypeTemp);
                     datacenter->beginHandshake(connection->isMediaConnection ? HandshakeTypeMediaTemp : HandshakeTypeTemp, true);
                     if (LOGS_ENABLED) DEBUG_D("connection(%p, account%u, dc%u, type %d) reset auth key due to -404 error", connection, instanceNum, datacenter->getDatacenterId(), connection->getConnectionType());
@@ -3134,21 +3137,7 @@ void ConnectionsManager::moveToDatacenter(uint32_t datacenterId) {
 
     Datacenter *currentDatacenter = getDatacenterWithId(currentDatacenterId);
     clearRequestsForDatacenter(currentDatacenter, HandshakeTypeAll);
-
-    if (currentUserId) {
-        auto request = new TL_auth_exportAuthorization();
-        request->dc_id = datacenterId;
-        sendRequest(request, [&, datacenterId](TLObject *response, TL_error *error, int32_t networkType, int64_t responseTime, int64_t msgId) {
-            if (error == nullptr) {
-                movingAuthorization = std::move(((TL_auth_exportedAuthorization *) response)->bytes);
-                authorizeOnMovingDatacenter();
-            } else {
-                moveToDatacenter(datacenterId);
-            }
-        }, nullptr, RequestFlagWithoutLogin, DEFAULT_DATACENTER_ID, ConnectionTypeGeneric, true);
-    } else {
-        authorizeOnMovingDatacenter();
-    }
+    authorizeOnMovingDatacenter();
 }
 
 void ConnectionsManager::authorizeOnMovingDatacenter() {

TMessagesProj/src/main/assets/arctic.attheme

@@ -1,18 +1,14 @@
 chat_unreadMessagesStartText=-14512671
 chat_inFileBackgroundSelected=-2823172
-chat_editDoneIcon=-15299074
 radioBackgroundChecked=-14638337
 dialogTextBlue=-14709290
 chat_inTextSelectionHighlight=673093357
 windowBackgroundWhiteBlueIcon=-12149256
 chat_inSentClockSelected=-7488295
-avatar_backgroundActionBarGreen=-1
 chat_goDownButtonCounterBackground=-13459733
 dialogCheckboxSquareBackground=-14380561
 chats_menuPhone=-1006632961
-avatar_actionBarIconOrange=-8684677
 chat_outViews=-1258291201
-avatar_actionBarSelectorCyan=-8684677
 chat_outViaBotNameText=-1
 profile_actionPressedBackground=-13924376
 location_sendLocationBackground=-11492107
@@ -22,7 +18,6 @@ chats_nameMessage=-13268780
 actionBarDefaultArchived=-1
 chat_messagePanelShadow=-452984832
 chat_inMediaIcon=-1
-avatar_subtitleInProfileViolet=-16777216
 chat_outAudioSeekbarFill=-1
 actionBarWhiteSelector=268435456
 location_actionPressedBackground=338794728
@@ -45,11 +40,9 @@ actionBarTabUnactiveText=-7630182
 chat_outAudioTitleText=-1
 chats_unreadCounter=-16012289
 chat_inReplyMediaMessageSelectedText=-7099204
-avatar_actionBarSelectorOrange=-8684677
 chat_inBubble=-1
 chat_emojiPanelNewTrending=-13329680
 chat_outSentCheckRead=-939524097
-avatar_backgroundActionBarOrange=-1
 windowBackgroundWhiteBlackText=-13421773
 avatar_backgroundActionBarBlue=-1
 dialogTextLink=-14317077
@@ -71,26 +64,20 @@ chat_inContactPhoneText=-6182221
 chat_inlineResultIcon=-13328651
 chats_draft=-85777850
 dialogLineProgress=-14508825
-listSelector=1311978291
 chat_serviceLink=-1
 chat_outPreviewInstantText=-1
 chat_inMenuSelected=-6110259
-avatar_actionBarSelectorGreen=-8684677
 chat_inLoaderSelected=-13394195
 chat_outLocationIcon=-452984833
-avatar_actionBarIconViolet=-8684677
 text_RedBold=-1682082
 chat_inBubbleShadow=1981626195
 chat_outAudioProgress=-10907938
-dialogProgressCircle=-12281108
-avatar_subtitleInProfilePink=-16777216
 player_progress=-14441474
 chat_inReplyLine=-12478487
 dialogLineProgressBackground=-3152133
 chat_inReplyNameText=-13464859
 chat_outAudioPerfomerSelectedText=-1
 profile_title=-13224394
-avatar_actionBarIconRed=-8684677
 chats_onlineCircle=-11810020
 chat_outAudioSelectedProgress=-10907938
 chat_messageTextOut=-1
@@ -100,13 +87,11 @@ avatar_backgroundSaved=-12208385
 returnToCallBackground=-13853967
 chat_fieldOverlayText=-15430146
 chat_messagePanelSend=-12935426
-windowBackgroundWhiteRedText2=-1817262
 avatar_backgroundBlue=-11491866
 chat_inSentClock=-5195068
 chat_botSwitchToInlineText=-13464859
 chats_nameMessageArchived=-7237231
 chats_tabUnreadUnactiveBackground=-13655305
-avatar_subtitleInProfileOrange=-16777216
 chat_outSentCheckSelected=-1191182337
 chat_inVenueInfoSelectedText=-7099204
 dialogTextBlue2=-14772773
@@ -115,10 +100,8 @@ actionBarTabActiveText=-13590803
 chat_topPanelMessage=-8354167
 calls_callReceivedGreenIcon=-13645978
 chats_pinnedOverlay=100663296
-chat_emojiPanelBadgeBackground=-12276493
 chat_inForwardedNameText=-13464859
 chats_sentError=-65536
-groupcreate_checkbox=-11415476
 chats_actionBackground=-11492107
 chat_outContactNameText=-1
 chat_TextSelectionCursor=-11424783
@@ -129,10 +112,8 @@ switch2TrackChecked=-11491347
 actionBarDefaultSearch=-16777216
 contextProgressOuter1=-14114562
 contextProgressOuter2=-12213505
-avatar_backgroundActionBarPink=-1
 chat_attachPollText=-2119680
 chat_attachContactText=-2121728
-avatar_actionBarIconCyan=-8291461
 windowBackgroundWhiteLinkText=-13464859
 chat_outVenueInfoText=-1056964609
 chat_outContactPhoneText=-1056964609
@@ -151,7 +132,6 @@ actionBarDefaultSearchPlaceholder=-2005173381
 chat_outForwardedNameText=-1
 dialogRoundCheckBox=-13653259
 actionBarTabLine=-13655305
-switchThumbChecked=-15299074
 chats_nameMessageArchived_threeLines=-7237231
 chat_outSiteNameText=-1
 chat_outUpCall=-4724737
@@ -162,7 +142,6 @@ dialogRadioBackgroundChecked=-14311696
 picker_badge=-13261833
 chat_outFileInfoSelectedText=-1056964609
 chat_outAudioDurationSelectedText=-1056964609
-avatar_actionBarSelectorPink=-8684677
 statisticChartLine_lightblue=-10966803
 statisticChartLine_blue=-13467675
 statisticChartLine_golden=-1853657
@@ -186,7 +165,6 @@ chat_inFileInfoText=-6182221
 avatar_subtitleInProfileBlue=-7500403
 chat_inPreviewLine=-12739084
 profile_creatorIcon=-15626754
-avatar_subtitleInProfileGreen=-16777216
 profile_actionBackground=-12408586
 chats_sentCheck=-13982474
 chat_outVoiceSeekbarFill=-1
@@ -197,15 +175,12 @@ chat_inContactBackground=-13393417
 chat_outVenueInfoSelectedText=-1056964609
 wallpaperFileOffset=-1
 chat_outBubbleShadow=868467
-chat_outVenueNameText=-11822380
 chat_outTextSelectionHighlight=1802747885
 chats_verifiedBackground=-12998152
 chat_inTimeSelectedText=-7099204
 chat_outFileBackgroundSelected=1351271669
 chat_outVoiceSeekbarSelected=1895825407
-avatar_backgroundActionBarViolet=-1
 actionBarDefaultTitle=-13421773
-avatar_actionBarIconPink=-8684671
 windowBackgroundWhiteBlueButton=-14509832
 profile_verifiedCheck=-1
 chat_attachLocationText=-12801233
@@ -216,7 +191,6 @@ picker_enabledButton=-14180619
 avatar_nameInMessagePink=-3453050
 windowBackgroundWhiteGrayText=-7629665
 chat_serviceIcon=-1
-avatar_actionBarSelectorViolet=-8684677
 avatar_nameInMessageBlue=-13464859
 actionBarDefault=-1
 profile_actionIcon=-1
@@ -230,7 +204,6 @@ chat_replyPanelIcons=-12086038
 chat_outSentClockSelected=1895825407
 featuredStickers_addedIcon=-13325569
 chat_outFileBackground=1351271669
-chat_attachSendBackground=-12608006
 chat_outBubbleSelected=-13332255
 avatar_backgroundInProfileBlue=-13330708
 chat_lockIcon=-9211021
@@ -255,7 +228,6 @@ avatar_actionBarIconBlue=-12433070
 chat_outTimeText=-1056964609
 chat_attachAudioText=-2209977
 chat_outBubble=-13332245
-avatar_backgroundActionBarCyan=-1
 chats_tabUnreadActiveBackground=-13655305
 actionBarDefaultArchivedTitle=-13420484
 chats_menuTopBackgroundCats=-11299889
@@ -277,18 +249,14 @@ inappPlayerClose=-7563878
 chat_outMediaIcon=-13332255
 chat_outAudioCacheSeekbar=738197503
 chats_sentClock=2066650878
-avatar_subtitleInProfileRed=-16777216
-avatar_backgroundActionBarRed=-1
 dialogFloatingButton=-12081419
 chats_archiveBackground=-11294989
 chat_inPreviewInstantText=-15299362
 chat_outLoaderSelected=-1
 chats_archivePinBackground=-4472113
 chat_sentError=-65536
-avatar_actionBarSelectorRed=-8684677
 chat_inAudioDurationSelectedText=-7099204
 chat_outAudioSeekbarSelected=1487394047
-avatar_actionBarIconGreen=-8291461
 chat_outReplyMessageText=-1
 chat_recordedVoiceDot=-833978
 chat_inVoiceSeekbarFill=-13132817
@@ -308,8 +276,6 @@ chat_outMenu=-1862270977
 statisticChartActiveLine=335544320
 chats_secretName=-16734706
 chat_outReplyMediaMessageSelectedText=-1056964609
-avatar_subtitleInProfileCyan=-16777216
 chat_serviceText=-1
 chats_attachMessage=-13268780
-key_changephoneinfo_changeText=-13131798
 chat_outSentClock=1895825407

TMessagesProj/src/main/assets/bluebubbles.attheme

@@ -146,7 +146,6 @@ chat_inLoader=-431707662
 chat_outTimeText=-141776195
 chat_attachAudioText=-2209977
 chat_outBubble=-1641732
-chat_attachHideBackground=-4866356
 chats_menuItemText=-12632257
 chat_outReplyNameText=-14382642
 chats_menuTopBackgroundCats=-10906430