Skip to content

MtProtoKit: dont drop the salt from bad_server_salt on normal requests (fixes infinite "Connecting" after backgrounding on iOS) #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sleep3r wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −9
Open

MtProtoKit: dont drop the salt from bad_server_salt on normal requests (fixes infinite "Connecting" after backgrounding on iOS) #2197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions submodules/MtProtoKit/Sources/MTProto.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2501,17 +2501,20 @@ - (void)_processIncomingMessage:(MTIncomingMessage *)incomingMessage totalSize:(

if ([badMsgNotification isKindOfClass:[MTBadServerSaltNotificationMessage class]])
{
// The server delivers a valid salt (nextServerSalt) inside the authenticated AES-IGE
// envelope, so it is equally trustworthy whether it rejects an ordinary request or the
// dedicated time-fix ping. Apply it directly. Previously a salt that rejected a normal
// request was discarded and the session entered MTProtoStateAwaitingTimeFixAndSalts
// (which gates every outgoing transaction); if the follow-up time-fix ping was then
// lost, nothing re-applied the salt or re-armed a transaction, so the session wedged
// until the DC closed the socket (~90-120s, surfaced to the user as a stuck "Updating").
if (_timeFixContext != nil && badMessageId == _timeFixContext.messageId)
{
_timeFixContext = nil;

int64_t validSalt = ((MTBadServerSaltNotificationMessage *)badMsgNotification).nextServerSalt;
NSTimeInterval timeDifference = incomingMessage.messageId / 4294967296.0 - [[NSDate date] timeIntervalSince1970];
[self completeTimeSync];
[self timeSyncInfoChanged:timeDifference saltList:@[[[MTDatacenterSaltInfo alloc] initWithSalt:validSalt firstValidMessageId:incomingMessage.messageId lastValidMessageId:incomingMessage.messageId + (4294967296 * 30 * 60)]] authInfoSelector:authInfoSelector];
}
else
[self initiateTimeSync];

int64_t validSalt = ((MTBadServerSaltNotificationMessage *)badMsgNotification).nextServerSalt;
NSTimeInterval timeDifference = incomingMessage.messageId / 4294967296.0 - [[NSDate date] timeIntervalSince1970];
[self completeTimeSync];
[self timeSyncInfoChanged:timeDifference saltList:@[[[MTDatacenterSaltInfo alloc] initWithSalt:validSalt firstValidMessageId:incomingMessage.messageId lastValidMessageId:incomingMessage.messageId + (4294967296 * 30 * 60)]] authInfoSelector:authInfoSelector];
}
else
{
Expand Down