From ec074f650da389f8f39b17d676333176428ea53b Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 9 Jul 2024 18:11:30 +0400 Subject: [PATCH] Revert "attempt to fix expired key for mtproto" This reverts commit d08dcacfdac8ed8097671d4e7ac3387e67bcb8f2. --- .../MtProtoKit/MTBindKeyMessageService.h | 1 - .../MtProtoKit/Sources/MTBindKeyMessageService.m | 4 ---- submodules/MtProtoKit/Sources/MTContext.m | 2 +- submodules/MtProtoKit/Sources/MTProto.m | 13 ++----------- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBindKeyMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBindKeyMessageService.h index 8e2fd4e958..9e5771a203 100644 --- a/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBindKeyMessageService.h +++ b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBindKeyMessageService.h @@ -6,5 +6,4 @@ - (instancetype)initWithPersistentKey:(MTDatacenterAuthKey *)persistentKey ephemeralKey:(MTDatacenterAuthKey *)ephemeralKey completion:(void (^)(bool))completion; --(void)complete; @end diff --git a/submodules/MtProtoKit/Sources/MTBindKeyMessageService.m b/submodules/MtProtoKit/Sources/MTBindKeyMessageService.m index 81444d51ab..137b2ce408 100644 --- a/submodules/MtProtoKit/Sources/MTBindKeyMessageService.m +++ b/submodules/MtProtoKit/Sources/MTBindKeyMessageService.m @@ -168,8 +168,4 @@ } } --(void)complete { - _completion(true); -} - @end diff --git a/submodules/MtProtoKit/Sources/MTContext.m b/submodules/MtProtoKit/Sources/MTContext.m index 676e4c64e8..7e506f5edc 100644 --- a/submodules/MtProtoKit/Sources/MTContext.m +++ b/submodules/MtProtoKit/Sources/MTContext.m @@ -250,7 +250,7 @@ static int32_t fixedTimeDifferenceValue = 0; _tempKeyExpiration = 24 * 60 * 60; #if DEBUG - _tempKeyExpiration = 30; + //_tempKeyExpiration = 30; #endif _datacenterSeedAddressSetById = [[NSMutableDictionary alloc] init]; diff --git a/submodules/MtProtoKit/Sources/MTProto.m b/submodules/MtProtoKit/Sources/MTProto.m index 2e31704d7e..965ee029d0 100644 --- a/submodules/MtProtoKit/Sources/MTProto.m +++ b/submodules/MtProtoKit/Sources/MTProto.m @@ -55,7 +55,7 @@ #import #import -#import + typedef enum { MTProtoStateAwaitingDatacenterScheme = 1, MTProtoStateAwaitingDatacenterAuthorization = 2, @@ -885,7 +885,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64; - (MTDatacenterAuthKey *)getAuthKeyForCurrentScheme:(MTTransportScheme *)scheme createIfNeeded:(bool)createIfNeeded authInfoSelector:(MTDatacenterAuthInfoSelector *)authInfoSelector { if (_useExplicitAuthKey) { - MTDatacenterAuthInfoSelector selector = scheme.media ? MTDatacenterAuthInfoSelectorEphemeralMedia : MTDatacenterAuthInfoSelectorEphemeralMain; + MTDatacenterAuthInfoSelector selector = MTDatacenterAuthInfoSelectorEphemeralMain; if (authInfoSelector != nil) { *authInfoSelector = selector; } @@ -2151,15 +2151,6 @@ static NSString *dumpHexString(NSData *data, int maxLength) { } if (_useExplicitAuthKey != nil) { - if (scheme.media) { - for (NSInteger i = (NSInteger)_messageServices.count - 1; i >= 0; i--) - { - MTBindKeyMessageService* messageService = (MTBindKeyMessageService *)_messageServices[(NSUInteger)i]; - if ([messageService respondsToSelector:@selector(complete)]) { - [messageService complete]; - } - } - } } else if (_cdn) { _validAuthInfo = nil;