no message

LegacyDatabase/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.9</string>
+	<string>4.9.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

LegacyDatabase/LegacyDatabase.h

@@ -39,7 +39,7 @@ FOUNDATION_EXPORT const unsigned char LegacyDatabaseVersionString[];
 #import <LegacyDatabase/PSLMDBTable.h>
 #import <LegacyDatabase/TGMemoryCache.h>
 #import <LegacyDatabase/TGPoolWithTimeout.h>
-#import <LegacyDatabase/ApiLayer82.h>
+#import <LegacyDatabase/ApiLayer86.h>
 
 #import <LegacyDatabase/TGPeerId.h>
 #import <LegacyDatabase/TGContactModel.h>

LegacyDatabase/TGChatListAvatarSignal.m

@@ -13,14 +13,14 @@ @implementation TGChatListAvatarSignal
 + (SSignal *)remoteChatListAvatarWithContext:(TGShareContext *)context location:(TGFileLocation *)location imageSize:(CGSize)imageSize
 {
     NSString *key = [NSString stringWithFormat:@"%@-%d", [location description], (int)imageSize.width];
-    Api82_InputFileLocation_inputFileLocation *inputFileLocation = [Api82_InputFileLocation inputFileLocationWithVolumeId:@(location.volumeId) localId:@(location.localId) secret:@(location.secret)];
-    return [[context datacenter:location.datacenterId function:[Api82 upload_getFileWithLocation:inputFileLocation offset:@(0) limit:@(1024 * 1024)]] map:^id(Api82_upload_File *result)
+    Api86_InputFileLocation_inputFileLocation *inputFileLocation = [Api86_InputFileLocation inputFileLocationWithVolumeId:@(location.volumeId) localId:@(location.localId) secret:@(location.secret) fileReference:location.fileReference];
+    return [[context datacenter:location.datacenterId function:[Api86 upload_getFileWithLocation:inputFileLocation offset:@(0) limit:@(1024 * 1024)]] map:^id(Api86_upload_File *result)
     {
-        if ([result isKindOfClass:[Api82_upload_File_upload_file class]]) {
-            [context.persistentCache setValue:((Api82_upload_File_upload_file *)result).bytes forKey:[[location description] dataUsingEncoding:NSUTF8StringEncoding]];
+        if ([result isKindOfClass:[Api86_upload_File_upload_file class]]) {
+            [context.persistentCache setValue:((Api86_upload_File_upload_file *)result).bytes forKey:[[location description] dataUsingEncoding:NSUTF8StringEncoding]];
 
             OSSpinLockLock(&imageDataLock);
-            UIImage *image = [[UIImage alloc] initWithData:((Api82_upload_File_upload_file *)result).bytes];
+            UIImage *image = [[UIImage alloc] initWithData:((Api86_upload_File_upload_file *)result).bytes];
             OSSpinLockUnlock(&imageDataLock);
 
             image = TGRoundImage(image, imageSize);

LegacyDatabase/TGChatListSignal.h

@@ -7,7 +7,7 @@
 
 @interface TGChatListSignal : NSObject
 
-+ (TGUserModel *)userModelWithApiUser:(Api82_User *)user;
++ (TGUserModel *)userModelWithApiUser:(Api86_User *)user;
 
 + (SSignal *)remoteChatListWithContext:(TGShareContext *)context;
 

LegacyDatabase/TGDatacenterConnectionContext.h

@@ -4,7 +4,7 @@
 #import <MTProtoKitDynamic/MTProto.h>
 #import <MTProtoKitDynamic/MTRequestMessageService.h>
 #import <SSignalKit/SSignalKit.h>
-#import "ApiLayer82.h"
+#import "ApiLayer86.h"
 
 @interface TGDatacenterConnectionContext : NSObject
 
@@ -15,7 +15,7 @@
 
 - (instancetype)initWithDatacenterId:(NSInteger)datacenterId mtContext:(MTContext *)mtContext mtProto:(MTProto *)mtProto mtRequestService:(MTRequestMessageService *)mtRequestService;
 
-- (SSignal *)function:(Api82_FunctionContext *)functionContext;
+- (SSignal *)function:(Api86_FunctionContext *)functionContext;
 
 @end
 

LegacyDatabase/TGDatacenterConnectionContext.m

@@ -27,7 +27,7 @@ - (void)dealloc
     [_mtProto stop];
 }
 
-- (SSignal *)function:(Api82_FunctionContext *)functionContext
+- (SSignal *)function:(Api86_FunctionContext *)functionContext
 {
     __weak TGDatacenterConnectionContext *weakSelf = self;
     return [[SSignal alloc] initWithGenerator:^id<SDisposable> (SSubscriber *subscriber)

LegacyDatabase/TGFileLocation.h

@@ -6,8 +6,9 @@
 @property (nonatomic, readonly) int64_t volumeId;
 @property (nonatomic, readonly) int32_t localId;
 @property (nonatomic, readonly) int64_t secret;
+@property (nonatomic, readonly) NSData *fileReference;
 
-- (instancetype)initWithDatacenterId:(NSInteger)datacenterId volumeId:(int64_t)volumeId localId:(int32_t)localId secret:(int64_t)secret;
+- (instancetype)initWithDatacenterId:(NSInteger)datacenterId volumeId:(int64_t)volumeId localId:(int32_t)localId secret:(int64_t)secret fileReference:(NSData *)fileReference;
 - (instancetype)initWithFileUrl:(NSString *)url;
 
 @end

LegacyDatabase/TGFileLocation.m

@@ -2,7 +2,7 @@
 
 @implementation TGFileLocation
 
-- (instancetype)initWithDatacenterId:(NSInteger)datacenterId volumeId:(int64_t)volumeId localId:(int32_t)localId secret:(int64_t)secret
+- (instancetype)initWithDatacenterId:(NSInteger)datacenterId volumeId:(int64_t)volumeId localId:(int32_t)localId secret:(int64_t)secret fileReference:(NSData *)fileReference
 {
     self = [super init];
     if (self != nil)
@@ -11,6 +11,7 @@ - (instancetype)initWithDatacenterId:(NSInteger)datacenterId volumeId:(int64_t)v
         _volumeId = volumeId;
         _localId = localId;
         _secret = secret;
+        _fileReference = fileReference;
     }
     return self;
 }
@@ -70,7 +71,7 @@ - (instancetype)initWithFileUrl:(NSString *)url
     int64_t secret;
 
     if (extractFileUrlComponents(url, &datacenterId, &volumeId, &localId, &secret))
-        return [self initWithDatacenterId:datacenterId volumeId:volumeId localId:localId secret:secret];
+        return [self initWithDatacenterId:datacenterId volumeId:volumeId localId:localId secret:secret fileReference:nil];
     else
         return nil;
 }

LegacyDatabase/TGSearchSignals.m

@@ -148,22 +148,22 @@ + (SSignal *)searchUsersWithContext:(TGShareContext *)context query:(NSString *)
     if (query.length < 5)
         return [SSignal single:@{@"chats": @[], @"users": @[]}];
 
-    return [[context function:[Api82 contacts_searchWithQ:query limit:@(100)]] map:^id(Api82_contacts_Found *result)
+    return [[context function:[Api86 contacts_searchWithQ:query limit:@(100)]] map:^id(Api86_contacts_Found *result)
     {
         NSMutableArray *chatModels = [[NSMutableArray alloc] init];
         NSMutableArray *userModels = [[NSMutableArray alloc] init];
 
-        for (Api82_User *user in result.users)
+        for (Api86_User *user in result.users)
         {
             TGUserModel *userModel = [TGChatListSignal userModelWithApiUser:user];
             if (userModel != nil)
                 [userModels addObject:userModel];
         }
 
-        for (Api82_Peer *peerFound in result.myResults)
+        for (Api86_Peer *peerFound in result.myResults)
         {
-            if ([peerFound isKindOfClass:[Api82_Peer_peerUser class]]) {
-                int32_t userId = [((Api82_Peer_peerUser *)peerFound).userId intValue];
+            if ([peerFound isKindOfClass:[Api86_Peer_peerUser class]]) {
+                int32_t userId = [((Api86_Peer_peerUser *)peerFound).userId intValue];
 
                 for (TGUserModel *userModel in userModels)
                 {
@@ -176,10 +176,10 @@ + (SSignal *)searchUsersWithContext:(TGShareContext *)context query:(NSString *)
             }
         }
 
-        for (Api82_Peer *peerFound in result.results)
+        for (Api86_Peer *peerFound in result.results)
         {
-            if ([peerFound isKindOfClass:[Api82_Peer_peerUser class]]) {
-                int32_t userId = [((Api82_Peer_peerUser *)peerFound).userId intValue];
+            if ([peerFound isKindOfClass:[Api86_Peer_peerUser class]]) {
+                int32_t userId = [((Api86_Peer_peerUser *)peerFound).userId intValue];
 
                 for (TGUserModel *userModel in userModels)
                 {

LegacyDatabase/TGSendMessageSignals.h

@@ -8,6 +8,6 @@
 @interface TGSendMessageSignals : NSObject
 
 + (SSignal *)sendTextMessageWithContext:(TGShareContext *)context peerId:(TGPeerId)peerId users:(NSArray *)users text:(NSString *)text;
-+ (SSignal *)sendMediaWithContext:(TGShareContext *)context peerId:(TGPeerId)peerId users:(NSArray *)users inputMedia:(Api82_InputMedia *)inputMedia;
++ (SSignal *)sendMediaWithContext:(TGShareContext *)context peerId:(TGPeerId)peerId users:(NSArray *)users inputMedia:(Api86_InputMedia *)inputMedia;
 
 @end

LegacyDatabase/TGSendMessageSignals.m

@@ -5,7 +5,7 @@
 
 @implementation TGSendMessageSignals
 
-+ (Api82_InputPeer *)inputPeerForPeerId:(TGPeerId)peerId users:(NSArray *)users isChannel:(bool *)isChannel
++ (Api86_InputPeer *)inputPeerForPeerId:(TGPeerId)peerId users:(NSArray *)users isChannel:(bool *)isChannel
 {
     switch (peerId.namespaceId)
     {
@@ -18,17 +18,17 @@ + (Api82_InputPeer *)inputPeerForPeerId:(TGPeerId)peerId users:(NSArray *)users
                     TGUserModel *user = (TGUserModel *)model;
 
                     if (user.accessHash == -1)
-                        return [Api82_InputPeer inputPeerSelf];
+                        return [Api86_InputPeer inputPeerSelf];
                     else
-                        return [Api82_InputPeer inputPeerUserWithUserId:@(user.userId) accessHash:@(user.accessHash)];
+                        return [Api86_InputPeer inputPeerUserWithUserId:@(user.userId) accessHash:@(user.accessHash)];
                 }
             }
         }
             break;
 
         case TGPeerIdGroup:
         {
-            return [Api82_InputPeer inputPeerChatWithChatId:@(peerId.peerId)];
+            return [Api86_InputPeer inputPeerChatWithChatId:@(peerId.peerId)];
         }
             break;
 
@@ -42,7 +42,7 @@ + (Api82_InputPeer *)inputPeerForPeerId:(TGPeerId)peerId users:(NSArray *)users
                     if (isChannel != NULL)
                         *isChannel = !channel.isGroup;
 
-                    return [Api82_InputPeer inputPeerChannelWithChannelId:@(channel.peerId.peerId) accessHash:@(channel.accessHash)];
+                    return [Api86_InputPeer inputPeerChannelWithChannelId:@(channel.peerId.peerId) accessHash:@(channel.accessHash)];
                 }
             }
         }
@@ -57,7 +57,7 @@ + (Api82_InputPeer *)inputPeerForPeerId:(TGPeerId)peerId users:(NSArray *)users
 + (SSignal *)sendTextMessageWithContext:(TGShareContext *)context peerId:(TGPeerId)peerId users:(NSArray *)users text:(NSString *)text
 {
     bool isChannel = false;
-    Api82_InputPeer *inputPeer = [self inputPeerForPeerId:peerId users:users isChannel:&isChannel];
+    Api86_InputPeer *inputPeer = [self inputPeerForPeerId:peerId users:users isChannel:&isChannel];
     if (inputPeer == nil)
         return [SSignal fail:nil];
 
@@ -68,13 +68,13 @@ + (SSignal *)sendTextMessageWithContext:(TGShareContext *)context peerId:(TGPeer
         flags |= 16;
     flags |= (1 << 6);
 
-    return [context function:[Api82 messages_sendMessageWithFlags:@(flags) peer:inputPeer replyToMsgId:@(0) message:text randomId:@(randomId) replyMarkup:nil entities:@[]]];
+    return [context function:[Api86 messages_sendMessageWithFlags:@(flags) peer:inputPeer replyToMsgId:@(0) message:text randomId:@(randomId) replyMarkup:nil entities:@[]]];
 }
 
-+ (SSignal *)sendMediaWithContext:(TGShareContext *)context peerId:(TGPeerId)peerId users:(NSArray *)users inputMedia:(Api82_InputMedia *)inputMedia
++ (SSignal *)sendMediaWithContext:(TGShareContext *)context peerId:(TGPeerId)peerId users:(NSArray *)users inputMedia:(Api86_InputMedia *)inputMedia
 { 
     bool isChannel = false;
-    Api82_InputPeer *inputPeer = [self inputPeerForPeerId:peerId users:users isChannel:&isChannel];
+    Api86_InputPeer *inputPeer = [self inputPeerForPeerId:peerId users:users isChannel:&isChannel];
     if (inputPeer == nil)
         return [SSignal fail:nil];
 
@@ -85,7 +85,7 @@ + (SSignal *)sendMediaWithContext:(TGShareContext *)context peerId:(TGPeerId)pee
         flags |= 16;
     flags |= (1 << 6);
 
-    return [context function:[Api82 messages_sendMediaWithFlags:@(flags) peer:inputPeer replyToMsgId:@(0) media:inputMedia message:@"" randomId:@(randomId) replyMarkup:nil entities:nil]];
+    return [context function:[Api86 messages_sendMediaWithFlags:@(flags) peer:inputPeer replyToMsgId:@(0) media:inputMedia message:@"" randomId:@(randomId) replyMarkup:nil entities:nil]];
 }
 
 @end

LegacyDatabase/TGShareContactSignals.m

@@ -1,6 +1,6 @@
 #import "TGShareContactSignals.h"
 
-#import "ApiLayer82.h"
+#import "ApiLayer86.h"
 #import "TGUploadedMessageContentMedia.h"
 #import "TGShareContactController.h"
 #import "TGVCard.h"
@@ -12,7 +12,7 @@ + (SSignal *)contactMessageContentForContact:(TGContactModel *)contact parentCon
     TGUploadedMessageContentMedia *(^content)(TGContactModel *) = ^TGUploadedMessageContentMedia *(TGContactModel *contact)
     {
         TGPhoneNumberModel *phoneNumber = contact.phoneNumbers.firstObject;
-        Api82_InputMedia_inputMediaContact *inputContact = [Api82_InputMedia inputMediaContactWithPhoneNumber:phoneNumber.phoneNumber firstName:contact.firstName.length == 0 ? @"" : contact.firstName lastName:contact.lastName.length == 0 ? @"" : contact.lastName vcard:contact.vcard.vcardString];
+        Api86_InputMedia_inputMediaContact *inputContact = [Api86_InputMedia inputMediaContactWithPhoneNumber:phoneNumber.phoneNumber firstName:contact.firstName.length == 0 ? @"" : contact.firstName lastName:contact.lastName.length == 0 ? @"" : contact.lastName vcard:contact.vcard.vcardString];
 
         return [[TGUploadedMessageContentMedia alloc] initWithInputMedia:inputContact];
     };

LegacyDatabase/TGShareContext.h

@@ -6,7 +6,7 @@
 #import <SSignalKit/SSignalKit.h>
 
 #import <SSignalKit/SSignalKit.h>
-#import <LegacyDatabase/ApiLayer82.h>
+#import <LegacyDatabase/ApiLayer86.h>
 
 #import <LegacyDatabase/TGModernCache.h>
 #import <LegacyDatabase/TGMemoryImageCache.h>
@@ -34,8 +34,8 @@
 
 - (instancetype)initWithContainerUrl:(NSURL *)containerUrl mtContext:(MTContext *)mtContext mtProto:(MTProto *)mtProto mtRequestService:(MTRequestMessageService *)mtRequestService clientUserId:(int32_t)clientUserId legacyDatabase:(TGLegacyDatabase *)legacyDatabase;
 
-- (SSignal *)function:(Api82_FunctionContext *)functionContext;
-- (SSignal *)datacenter:(NSInteger)datacenterId function:(Api82_FunctionContext *)functionContext;
+- (SSignal *)function:(Api86_FunctionContext *)functionContext;
+- (SSignal *)datacenter:(NSInteger)datacenterId function:(Api86_FunctionContext *)functionContext;
 
 - (SSignal *)connectionContextForDatacenter:(NSInteger)datacenterId;
 

LegacyDatabase/TGShareContext.m

@@ -48,7 +48,7 @@ - (void)dealloc
     [_mtProto stop];
 }
 
-- (SSignal *)function:(Api82_FunctionContext *)functionContext
+- (SSignal *)function:(Api86_FunctionContext *)functionContext
 {
     __weak TGShareContext *weakSelf = self;
     return [[SSignal alloc] initWithGenerator:^id<SDisposable> (SSubscriber *subscriber)
@@ -146,7 +146,7 @@ - (void)returnPooledDatacenterConnectionContext:(TGDatacenterConnectionContext *
     [_datacenterPoolsLock unlock];
 }
 
-- (SSignal *)datacenter:(NSInteger)datacenterId function:(Api82_FunctionContext *)functionContext
+- (SSignal *)datacenter:(NSInteger)datacenterId function:(Api86_FunctionContext *)functionContext
 {
     __weak TGShareContext *weakSelf = self;
     return [[self pooledConnectionContextForDatacenter:datacenterId] mapToSignal:^SSignal *(TGDatacenterConnectionContext *datacenterConnectionContext)

LegacyDatabase/TGShareLocationSignals.m

@@ -1,6 +1,6 @@
 #import "TGShareLocationSignals.h"
 
-#import "ApiLayer82.h"
+#import "ApiLayer86.h"
 #import "TGUploadedMessageContentText.h"
 #import "TGUploadedMessageContentMedia.h"
 
@@ -59,7 +59,7 @@ - (NSString *)URLEncodedStringValueWithEncoding:(NSStringEncoding)stringEncoding
         string = unescapedString;
     }
 
-    return (__bridge NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, NULL, (__bridge CFStringRef)kAFLegalCharactersToBeEscaped, CFStringConvertNSStringEncodingToEncoding(encoding));
+    return (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, NULL, (__bridge CFStringRef)kAFLegalCharactersToBeEscaped, CFStringConvertNSStringEncodingToEncoding(encoding));
 }
 
 @implementation TGQueryStringComponent
@@ -161,7 +161,7 @@ + (SSignal *)_appleMapsLocationContentForURL:(NSURL *)url
         }
         else if ([queryItem.name isEqualToString:TGShareAppleMapsNameKey])
         {
-            if (![queryItem.value isEqualToString:latLon])
+            if (latLon != nil && ![queryItem.value isEqualToString:latLon])
                 name = queryItem.value;
         }
         else if ([queryItem.name isEqualToString:TGShareAppleMapsAddressKey])
@@ -184,8 +184,8 @@ + (SSignal *)_appleMapsLocationContentForURL:(NSURL *)url
     double latitude = [coordComponents.firstObject floatValue];
     double longitude = [coordComponents.lastObject floatValue];
 
-    Api82_InputGeoPoint *geoPoint = [Api82_InputGeoPoint inputGeoPointWithLat:@(latitude) plong:@(longitude)];
-    Api82_InputMedia *inputMedia = nil;
+    Api86_InputGeoPoint *geoPoint = [Api86_InputGeoPoint inputGeoPointWithLat:@(latitude) plong:@(longitude)];
+    Api86_InputMedia *inputMedia = nil;
 
     if (address == nil)
         address = @"";
@@ -194,9 +194,9 @@ + (SSignal *)_appleMapsLocationContentForURL:(NSURL *)url
         venueId = @"";
 
     if (name.length > 0)
-        inputMedia = [Api82_InputMedia inputMediaVenueWithGeoPoint:geoPoint title:name address:address provider:TGShareAppleMapsProvider venueId:venueId venueType:@""];
+        inputMedia = [Api86_InputMedia inputMediaVenueWithGeoPoint:geoPoint title:name address:address provider:TGShareAppleMapsProvider venueId:venueId venueType:@""];
     else
-        inputMedia = [Api82_InputMedia inputMediaGeoPointWithGeoPoint:geoPoint];
+        inputMedia = [Api86_InputMedia inputMediaGeoPointWithGeoPoint:geoPoint];
 
     return [SSignal single:[[TGUploadedMessageContentMedia alloc] initWithInputMedia:inputMedia]];
 }
@@ -248,8 +248,8 @@ + (SSignal *)_foursquareLocationForURL:(NSURL *)url
         if (name.length == 0)
             return [SSignal fail:nil];
 
-        Api82_InputGeoPoint *geoPoint = [Api82_InputGeoPoint inputGeoPointWithLat:@(latitude) plong:@(longitude)];
-        Api82_InputMedia_inputMediaVenue *inputVenue = [Api82_InputMedia inputMediaVenueWithGeoPoint:geoPoint title:name address:address provider:TGShareFoursquareProvider venueId:venueId venueType:@""];
+        Api86_InputGeoPoint *geoPoint = [Api86_InputGeoPoint inputGeoPointWithLat:@(latitude) plong:@(longitude)];
+        Api86_InputMedia_inputMediaVenue *inputVenue = [Api86_InputMedia inputMediaVenueWithGeoPoint:geoPoint title:name address:address provider:TGShareFoursquareProvider venueId:venueId venueType:@""];
 
         return [SSignal single:[[TGUploadedMessageContentMedia alloc] initWithInputMedia:inputVenue]];
     }];
@@ -304,8 +304,8 @@ + (SSignal *)_googleMapsLocationForURL:(NSURL *)url
         if (fabs(latitude) < DBL_EPSILON && fabs(longitude) < DBL_EPSILON)
             return [SSignal fail:nil];
 
-        Api82_InputGeoPoint *geoPoint = [Api82_InputGeoPoint inputGeoPointWithLat:@(latitude) plong:@(longitude)];
-        return [SSignal single:[[TGUploadedMessageContentMedia alloc] initWithInputMedia:[Api82_InputMedia inputMediaGeoPointWithGeoPoint:geoPoint]]];
+        Api86_InputGeoPoint *geoPoint = [Api86_InputGeoPoint inputGeoPointWithLat:@(latitude) plong:@(longitude)];
+        return [SSignal single:[[TGUploadedMessageContentMedia alloc] initWithInputMedia:[Api86_InputMedia inputMediaGeoPointWithGeoPoint:geoPoint]]];
     };
 
     SSignal *signal = nil;