ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-09 22:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter 2018-10-27 22:49:10 +03:00
parent 4f85c11a8e
commit e7113ed683
3 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
MTProtoKit/MTProto.m
View File

@ -331,43 +331,32 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
tempAuthKeyType = MTDatacenterAuthTempKeyTypeMedia; tempAuthKeyType = MTDatacenterAuthTempKeyTypeMedia;
} }
if (_transportScheme == nil) if (_transportScheme == nil) {
{ if ((_mtState & MTProtoStateAwaitingDatacenterScheme) == 0) {
if ((_mtState & MTProtoStateAwaitingDatacenterScheme) == 0)
{
[self setMtState:_mtState | MTProtoStateAwaitingDatacenterScheme]; [self setMtState:_mtState | MTProtoStateAwaitingDatacenterScheme];
[_context transportSchemeForDatacenterWithIdRequired:_datacenterId media:_media]; [_context transportSchemeForDatacenterWithIdRequired:_datacenterId media:_media];
} }
} } else if (!_useUnauthorizedMode && [_context authInfoForDatacenterWithId:_datacenterId] == nil) {
else if (!_useUnauthorizedMode && [_context authInfoForDatacenterWithId:_datacenterId] == nil) if ((_mtState & MTProtoStateAwaitingDatacenterAuthorization) == 0) {
{
if ((_mtState & MTProtoStateAwaitingDatacenterAuthorization) == 0)
{
[self setMtState:_mtState | MTProtoStateAwaitingDatacenterAuthorization]; [self setMtState:_mtState | MTProtoStateAwaitingDatacenterAuthorization];
[_context authInfoForDatacenterWithIdRequired:_datacenterId isCdn:_cdn]; [_context authInfoForDatacenterWithIdRequired:_datacenterId isCdn:_cdn];
} }
} } else if (!_useUnauthorizedMode && _useTempAuthKeys && [[_context authInfoForDatacenterWithId:_datacenterId] tempAuthKeyWithType:tempAuthKeyType] == nil) {
else if (!_useUnauthorizedMode && _useTempAuthKeys && [[_context authInfoForDatacenterWithId:_datacenterId] tempAuthKeyWithType:tempAuthKeyType] == nil) { if ((_mtState & MTProtoStateAwaitingDatacenterTempAuthKey) == 0) {
if ((_mtState & MTProtoStateAwaitingDatacenterTempAuthKey) == 0)
{
[self setMtState:_mtState | MTProtoStateAwaitingDatacenterTempAuthKey]; [self setMtState:_mtState | MTProtoStateAwaitingDatacenterTempAuthKey];
[_context tempAuthKeyForDatacenterWithIdRequired:_datacenterId keyType:tempAuthKeyType]; [_context tempAuthKeyForDatacenterWithIdRequired:_datacenterId keyType:tempAuthKeyType];
} }
} }
else if (_requiredAuthToken != nil && !_useUnauthorizedMode && ![_requiredAuthToken isEqual:[_context authTokenForDatacenterWithId:_datacenterId]]) else if (_requiredAuthToken != nil && !_useUnauthorizedMode && ![_requiredAuthToken isEqual:[_context authTokenForDatacenterWithId:_datacenterId]]) {
{ if ((_mtState & MTProtoStateAwaitingDatacenterAuthToken) == 0) {
if ((_mtState & MTProtoStateAwaitingDatacenterAuthToken) == 0)
{
[self setMtState:_mtState | MTProtoStateAwaitingDatacenterAuthToken]; [self setMtState:_mtState | MTProtoStateAwaitingDatacenterAuthToken];
[_context authTokenForDatacenterWithIdRequired:_datacenterId authToken:_requiredAuthToken masterDatacenterId:_authTokenMasterDatacenterId]; [_context authTokenForDatacenterWithIdRequired:_datacenterId authToken:_requiredAuthToken masterDatacenterId:_authTokenMasterDatacenterId];
} }
} } else {
else
{
MTTransport *transport = nil; MTTransport *transport = nil;
transport = [_transportScheme createTransportWithContext:_context datacenterId:_datacenterId delegate:self usageCalculationInfo:_usageCalculationInfo]; transport = [_transportScheme createTransportWithContext:_context datacenterId:_datacenterId delegate:self usageCalculationInfo:_usageCalculationInfo];
@ -515,7 +504,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
if (notifyAboutServiceTask) if (notifyAboutServiceTask)
{ {
if (MTLogEnabled()) { if (MTLogEnabled()) {
MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, true ? "yes" : "no"); MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, "yes");
} }
for (id<MTMessageService> messageService in _messageServices) for (id<MTMessageService> messageService in _messageServices)
@ -567,7 +556,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
if (!performingServiceTasks) if (!performingServiceTasks)
{ {
if (MTLogEnabled()) { if (MTLogEnabled()) {
MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, false ? "yes" : "no"); MTLog(@"[MTProto#%p service tasks state: %d, resend: %s]", self, _mtState, "no");
} }
for (id<MTMessageService> messageService in _messageServices) for (id<MTMessageService> messageService in _messageServices)
@ -875,6 +864,8 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
return; return;
} }
//bool debugResetTransport = false;
bool extendedPadding = false; bool extendedPadding = false;
if (transport.proxySettings != nil && transport.proxySettings.secret.length != 0) { if (transport.proxySettings != nil && transport.proxySettings.secret.length != 0) {
if ([MTSocksProxySettings secretSupportsExtendedPadding:transport.proxySettings.secret]) { if ([MTSocksProxySettings secretSupportsExtendedPadding:transport.proxySettings.secret]) {
@ -998,7 +989,18 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
} }
if (MTLogEnabled()) { if (MTLogEnabled()) {
MTLog(@"[MTProto#%p preparing %@]", self, [self outgoingMessageDescription:outgoingMessage messageId:messageId messageSeqNo:messageSeqNo]); NSString *messageDescription = [self outgoingMessageDescription:outgoingMessage messageId:messageId messageSeqNo:messageSeqNo];
/*if ([messageDescription hasPrefix:@"updates.getDifference"]) {
static dispatch_once_t onceToken;
__block bool flag = false;
dispatch_once(&onceToken, ^{
flag = true;
});
if (flag) {
debugResetTransport = true;
}
}*/
MTLog(@"[MTProto#%p preparing %@]", self, messageDescription);
} }
if (!monotonityViolated || _useUnauthorizedMode) if (!monotonityViolated || _useUnauthorizedMode)
@ -1473,11 +1475,15 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
} }
else if (transactionReady != nil) else if (transactionReady != nil)
transactionReady(nil); transactionReady(nil);
/*if (debugResetTransport) {
[self resetTransport];
[self requestTransportTransaction];
}*/
}]; }];
} }
- (NSData *)_dataForEncryptedContainerWithMessages:(NSArray *)preparedMessages sessionInfo:(MTSessionInfo *)sessionInfo quickAckId:(int32_t *)quickAckId address:(MTDatacenterAddress *)address extendedPadding:(bool)extendedPadding - (NSData *)_dataForEncryptedContainerWithMessages:(NSArray *)preparedMessages sessionInfo:(MTSessionInfo *)sessionInfo quickAckId:(int32_t *)quickAckId address:(MTDatacenterAddress *)address extendedPadding:(bool)extendedPadding {
{
MTDatacenterAuthKey *effectiveAuthKey; MTDatacenterAuthKey *effectiveAuthKey;
if (_useTempAuthKeys) { if (_useTempAuthKeys) {
MTDatacenterAuthTempKeyType tempAuthKeyType = MTDatacenterAuthTempKeyTypeMain; MTDatacenterAuthTempKeyType tempAuthKeyType = MTDatacenterAuthTempKeyTypeMain;
@ -1499,8 +1505,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
[containerOs writeInt32:(int32_t)preparedMessages.count]; [containerOs writeInt32:(int32_t)preparedMessages.count];
int64_t salt = 0; int64_t salt = 0;
for (MTPreparedMessage *preparedMessage in preparedMessages) for (MTPreparedMessage *preparedMessage in preparedMessages) {
{
salt = preparedMessage.salt; salt = preparedMessage.salt;
[containerOs writeInt64:preparedMessage.messageId]; [containerOs writeInt64:preparedMessage.messageId];
@ -1517,13 +1522,11 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
MTOutputStream *decryptedOs = [[MTOutputStream alloc] init]; MTOutputStream *decryptedOs = [[MTOutputStream alloc] init];
int64_t containerMessageId = [sessionInfo generateClientMessageId:NULL]; int64_t containerMessageId = [sessionInfo generateClientMessageId:NULL];
if (containerMessageIds.count != 0) if (containerMessageIds.count != 0) {
{
[sessionInfo addContainerMessageIdMapping:containerMessageId childMessageIds:containerMessageIds]; [sessionInfo addContainerMessageIdMapping:containerMessageId childMessageIds:containerMessageIds];
NSMutableString *idsString = [[NSMutableString alloc] init]; NSMutableString *idsString = [[NSMutableString alloc] init];
for (NSNumber *nMessageId in containerMessageIds) for (NSNumber *nMessageId in containerMessageIds) {
{
if (idsString.length != 0) if (idsString.length != 0)
[idsString appendString:@","]; [idsString appendString:@","];
[idsString appendFormat:@"%lld", [nMessageId longLongValue]]; [idsString appendFormat:@"%lld", [nMessageId longLongValue]];

1
MTProtoKit/MTRequest.h
View File

@ -15,6 +15,7 @@
@property (nonatomic, strong, readonly) id (^responseParser)(NSData *); @property (nonatomic, strong, readonly) id (^responseParser)(NSData *);
@property (nonatomic, strong) NSArray *decorators; @property (nonatomic, strong) NSArray *decorators;
@property (nonatomic) int32_t transactionResetStateVersion;
@property (nonatomic, strong) MTRequestContext *requestContext; @property (nonatomic, strong) MTRequestContext *requestContext;
@property (nonatomic, strong) MTRequestErrorContext *errorContext; @property (nonatomic, strong) MTRequestErrorContext *errorContext;
@property (nonatomic) bool hasHighPriority; @property (nonatomic) bool hasHighPriority;

21
MTProtoKit/MTRequestMessageService.m
View File

@ -461,12 +461,21 @@
if (messages.count != 0) if (messages.count != 0)
{ {
NSMutableDictionary *requestInternalIdToTransactionResetStateVersion = [[NSMutableDictionary alloc] init];
for (MTRequest *request in _requests) {
requestInternalIdToTransactionResetStateVersion[request.internalId] = @(request.transactionResetStateVersion);
}
return [[MTMessageTransaction alloc] initWithMessagePayload:messages prepared:^(NSDictionary *messageInternalIdToPreparedMessage) { return [[MTMessageTransaction alloc] initWithMessagePayload:messages prepared:^(NSDictionary *messageInternalIdToPreparedMessage) {
for (MTRequest *request in _requests) { for (MTRequest *request in _requests) {
id messageInternalId = requestInternalIdToMessageInternalId[request.internalId]; id messageInternalId = requestInternalIdToMessageInternalId[request.internalId];
if (messageInternalId != nil) { if (messageInternalId != nil) {
MTPreparedMessage *preparedMessage = messageInternalIdToPreparedMessage[messageInternalId]; MTPreparedMessage *preparedMessage = messageInternalIdToPreparedMessage[messageInternalId];
if (preparedMessage != nil) { if (preparedMessage != nil) {
NSNumber *nTransactionResetStateVersion = requestInternalIdToTransactionResetStateVersion[request.internalId];
if (nTransactionResetStateVersion != nil && [nTransactionResetStateVersion intValue] != request.transactionResetStateVersion) {
continue;
}
MTRequestContext *requestContext = [[MTRequestContext alloc] initWithMessageId:preparedMessage.messageId messageSeqNo:preparedMessage.seqNo transactionId:nil quickAckId:0]; MTRequestContext *requestContext = [[MTRequestContext alloc] initWithMessageId:preparedMessage.messageId messageSeqNo:preparedMessage.seqNo transactionId:nil quickAckId:0];
requestContext.willInitializeApi = requestsWillInitializeApi; requestContext.willInitializeApi = requestsWillInitializeApi;
requestContext.waitingForMessageId = true; requestContext.waitingForMessageId = true;
@ -492,6 +501,10 @@
MTPreparedMessage *preparedMessage = messageInternalIdToPreparedMessage[messageInternalId]; MTPreparedMessage *preparedMessage = messageInternalIdToPreparedMessage[messageInternalId];
if (preparedMessage != nil && messageInternalIdToTransactionId[messageInternalId] != nil) if (preparedMessage != nil && messageInternalIdToTransactionId[messageInternalId] != nil)
{ {
NSNumber *nTransactionResetStateVersion = requestInternalIdToTransactionResetStateVersion[request.internalId];
if (nTransactionResetStateVersion != nil && [nTransactionResetStateVersion intValue] != request.transactionResetStateVersion) {
continue;
}
MTRequestContext *requestContext = [[MTRequestContext alloc] initWithMessageId:preparedMessage.messageId messageSeqNo:preparedMessage.seqNo transactionId:messageInternalIdToTransactionId[messageInternalId] quickAckId:(int32_t)[messageInternalIdToQuickAckId[messageInternalId] intValue]]; MTRequestContext *requestContext = [[MTRequestContext alloc] initWithMessageId:preparedMessage.messageId messageSeqNo:preparedMessage.seqNo transactionId:messageInternalIdToTransactionId[messageInternalId] quickAckId:(int32_t)[messageInternalIdToQuickAckId[messageInternalId] intValue]];
requestContext.willInitializeApi = requestsWillInitializeApi; requestContext.willInitializeApi = requestsWillInitializeApi;
request.requestContext = requestContext; request.requestContext = requestContext;
@ -789,6 +802,9 @@
if (request.requestContext != nil && request.requestContext.transactionId != nil && [transactionIds containsObject:request.requestContext.transactionId]) if (request.requestContext != nil && request.requestContext.transactionId != nil && [transactionIds containsObject:request.requestContext.transactionId])
{ {
request.requestContext.transactionId = nil; request.requestContext.transactionId = nil;
request.requestContext.delivered = false;
request.requestContext.waitingForMessageId = false;
request.transactionResetStateVersion += 1;
requestTransaction = true; requestTransaction = true;
} }
} }
@ -803,9 +819,12 @@
for (MTRequest *request in _requests) for (MTRequest *request in _requests)
{ {
if (request.requestContext != nil && request.requestContext.transactionId != nil) if (request.requestContext != nil)
{ {
request.requestContext.transactionId = nil; request.requestContext.transactionId = nil;
request.requestContext.delivered = false;
request.requestContext.waitingForMessageId = false;
request.transactionResetStateVersion += 1;
requestTransaction = true; requestTransaction = true;
} }
} }