Make all API enums indirect

TelegramCore.xcodeproj/project.pbxproj

@@ -63,7 +63,6 @@
 		C251D7441E65E50500283EDE /* StickerSetInstallation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C251D7421E65E50500283EDE /* StickerSetInstallation.swift */; };
 		C25638021E79E7FC00311607 /* TwoStepVerification.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FA0ABC1E76C908005BB9B7 /* TwoStepVerification.swift */; };
 		C26A37EF1E5E0C41006977AC /* ChannelParticipants.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BB7C591E5C8074001527C3 /* ChannelParticipants.swift */; };
-		C27982511E72C97800262BFD /* MacosLegacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27982501E72C97800262BFD /* MacosLegacy.swift */; };
 		C28725421EF967E700613564 /* NotificationInfoMessageAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28725411EF967E700613564 /* NotificationInfoMessageAttribute.swift */; };
 		C28725431EF967E700613564 /* NotificationInfoMessageAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28725411EF967E700613564 /* NotificationInfoMessageAttribute.swift */; };
 		C28D3CF020D3DA900027F4D6 /* DeepLinkInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28D3CEF20D3DA900027F4D6 /* DeepLinkInfo.swift */; };
@@ -200,8 +199,6 @@
 		D02DADC12139A1FC00116225 /* ContactSyncManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D02DADC02139A1FC00116225 /* ContactSyncManager.swift */; };
 		D02DADC22139A1FC00116225 /* ContactSyncManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D02DADC02139A1FC00116225 /* ContactSyncManager.swift */; };
 		D03121021DA57E93006A2A60 /* TelegramPeerNotificationSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03121011DA57E93006A2A60 /* TelegramPeerNotificationSettings.swift */; };
-		D03229F41E6B39700000AF9C /* ImportAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03229F31E6B39700000AF9C /* ImportAccount.swift */; };
-		D03229F51E6B39700000AF9C /* ImportAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03229F31E6B39700000AF9C /* ImportAccount.swift */; };
 		D032F5BC20EF84FD00037B6C /* FetchedMediaResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D032F5BB20EF84FD00037B6C /* FetchedMediaResource.swift */; };
 		D032F5BD20EF84FD00037B6C /* FetchedMediaResource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D032F5BB20EF84FD00037B6C /* FetchedMediaResource.swift */; };
 		D0338740223BD48B007A2CE4 /* ContactsSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D033873F223BD48B007A2CE4 /* ContactsSettings.swift */; };
@@ -844,7 +841,6 @@
 		C239BE9B1E630CA700C2C453 /* UpdatePinnedMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdatePinnedMessage.swift; sourceTree = "<group>"; };
 		C23BC3861E9BE3CA00D79F92 /* ImportContact.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportContact.swift; sourceTree = "<group>"; };
 		C251D7421E65E50500283EDE /* StickerSetInstallation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StickerSetInstallation.swift; sourceTree = "<group>"; };
-		C27982501E72C97800262BFD /* MacosLegacy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MacosLegacy.swift; sourceTree = "<group>"; };
 		C28725411EF967E700613564 /* NotificationInfoMessageAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationInfoMessageAttribute.swift; sourceTree = "<group>"; };
 		C28D3CEF20D3DA900027F4D6 /* DeepLinkInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLinkInfo.swift; sourceTree = "<group>"; };
 		C29340F21F5080FA0074991E /* UpdateGroupSpecificStickerset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateGroupSpecificStickerset.swift; sourceTree = "<group>"; };
@@ -913,7 +909,6 @@
 		D02D60AA206BA64100FEFE1E /* VerifySecureIdValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VerifySecureIdValue.swift; sourceTree = "<group>"; };
 		D02DADC02139A1FC00116225 /* ContactSyncManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactSyncManager.swift; sourceTree = "<group>"; };
 		D03121011DA57E93006A2A60 /* TelegramPeerNotificationSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TelegramPeerNotificationSettings.swift; sourceTree = "<group>"; };
-		D03229F31E6B39700000AF9C /* ImportAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportAccount.swift; sourceTree = "<group>"; };
 		D032F5BB20EF84FD00037B6C /* FetchedMediaResource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchedMediaResource.swift; sourceTree = "<group>"; };
 		D033873F223BD48B007A2CE4 /* ContactsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsSettings.swift; sourceTree = "<group>"; };
 		D0338742223BD532007A2CE4 /* InitializeAccountAfterLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InitializeAccountAfterLogin.swift; sourceTree = "<group>"; };
@@ -1281,14 +1276,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		C279824F1E72C96B00262BFD /* legacy */ = {
-			isa = PBXGroup;
-			children = (
-				C27982501E72C97800262BFD /* MacosLegacy.swift */,
-			);
-			name = legacy;
-			sourceTree = "<group>";
-		};
 		D01B27A01E394D7B0022A4C0 /* Settings */ = {
 			isa = PBXGroup;
 			children = (
@@ -1399,7 +1386,6 @@
 				D0FA8BAC1E1FD6E2001E855B /* MemoryBufferExtensions.swift */,
 				D0448C9E1E27F5EB005A61A7 /* Random.swift */,
 				D050F20F1E48AB0600988324 /* InteractivePhoneFormatter.swift */,
-				D03229F31E6B39700000AF9C /* ImportAccount.swift */,
 				D04CAA591E83310D0047E51F /* MD5.swift */,
 				D042C6821E8D9DF800C863B0 /* Unixtime.swift */,
 				D01C7F031EFC1C49008305F1 /* DeviceContact.swift */,
@@ -1846,7 +1832,6 @@
 		D09D8C031D4FAB1D0081DBEC /* TelegramCore */ = {
 			isa = PBXGroup;
 			children = (
-				C279824F1E72C96B00262BFD /* legacy */,
 				D03B0C791D62153400955575 /* third-party */,
 				D03B0CB71D62232000955575 /* Utils */,
 				D03B0CCF1D62242200955575 /* Objects */,
@@ -2209,7 +2194,6 @@
 				D00DBBD71E64E41100DB5485 /* CreateSecretChat.swift in Sources */,
 				C2FD33EB1E696C78008D13D4 /* GroupsInCommon.swift in Sources */,
 				D0FA8BB01E1FEC7E001E855B /* SecretChatEncryptionConfig.swift in Sources */,
-				D03229F41E6B39700000AF9C /* ImportAccount.swift in Sources */,
 				D021E0DF1DB539FC00C6B04F /* StickerPack.swift in Sources */,
 				D03B0D091D62255C00955575 /* EnqueueMessage.swift in Sources */,
 				D0CA8E4B227209C4008A74C3 /* ManagedSynchronizeGroupMessageStats.swift in Sources */,
@@ -2622,7 +2606,6 @@
 				D00DBBD81E64E41100DB5485 /* CreateSecretChat.swift in Sources */,
 				C2FD33EC1E696C79008D13D4 /* GroupsInCommon.swift in Sources */,
 				C239BE9D1E630CB300C2C453 /* UpdatePinnedMessage.swift in Sources */,
-				D03229F51E6B39700000AF9C /* ImportAccount.swift in Sources */,
 				C239BE981E62F0D200C2C453 /* LoadMessagesIfNecessary.swift in Sources */,
 				D01C7ED41EF5DF83008305F1 /* LimitsConfiguration.swift in Sources */,
 				D051DB15215EC5A300F30F92 /* AppChangelogState.swift in Sources */,
@@ -2896,7 +2879,6 @@
 				D0FA8BB71E223C16001E855B /* SecretApiLayer8.swift in Sources */,
 				D0EC559B2101ED0800D1992C /* DeleteMessages.swift in Sources */,
 				D073CE6A1DCBCF17007511FD /* ViewCountMessageAttribute.swift in Sources */,
-				C27982511E72C97800262BFD /* MacosLegacy.swift in Sources */,
 				D0B418AB1D7E0597004562A4 /* MultipartFetch.swift in Sources */,
 				D01A21AA1F38CDDC00DDA104 /* ManagedSynchronizeSavedStickersOperations.swift in Sources */,
 				D0546495207386D7002ECC1E /* SecureIdUtilityBillValue.swift in Sources */,

TelegramCore.xcodeproj/xcshareddata/xcschemes/TelegramCore.xcscheme

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D09D8C001D4FAB1D0081DBEC"
+               BuildableName = "TelegramCore.framework"
+               BlueprintName = "TelegramCore"
+               ReferencedContainer = "container:TelegramCore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "DebugAppStore"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D09D8C091D4FAB1D0081DBEC"
+               BuildableName = "TelegramCoreTests.xctest"
+               BlueprintName = "TelegramCoreTests"
+               ReferencedContainer = "container:TelegramCore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D09D8C001D4FAB1D0081DBEC"
+            BuildableName = "TelegramCore.framework"
+            BlueprintName = "TelegramCore"
+            ReferencedContainer = "container:TelegramCore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "DebugAppStore"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D09D8C001D4FAB1D0081DBEC"
+            BuildableName = "TelegramCore.framework"
+            BlueprintName = "TelegramCore"
+            ReferencedContainer = "container:TelegramCore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "ReleaseHockeyapp"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D09D8C001D4FAB1D0081DBEC"
+            BuildableName = "TelegramCore.framework"
+            BlueprintName = "TelegramCore"
+            ReferencedContainer = "container:TelegramCore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "DebugAppStore">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "ReleaseHockeyapp"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

TelegramCore/Api0.swift

@@ -269,10 +269,10 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[1158290442] = { return Api.messages.FoundGifs.parse_foundGifs($0) }
     dict[-1132476723] = { return Api.FileLocation.parse_fileLocationToBeDeprecated($0) }
     dict[-716006138] = { return Api.Poll.parse_poll($0) }
+    dict[-1195615476] = { return Api.InputNotifyPeer.parse_inputNotifyPeer($0) }
     dict[423314455] = { return Api.InputNotifyPeer.parse_inputNotifyUsers($0) }
     dict[1251338318] = { return Api.InputNotifyPeer.parse_inputNotifyChats($0) }
     dict[-1311015810] = { return Api.InputNotifyPeer.parse_inputNotifyBroadcasts($0) }
-    dict[-1195615476] = { return Api.InputNotifyPeer.parse_inputNotifyPeer($0) }
     dict[-317144808] = { return Api.EncryptedMessage.parse_encryptedMessage($0) }
     dict[594758406] = { return Api.EncryptedMessage.parse_encryptedMessageService($0) }
     dict[-566281095] = { return Api.ChannelParticipantsFilter.parse_channelParticipantsRecent($0) }
@@ -1315,7 +1315,7 @@ struct Api {
 }
 extension Api {
 struct messages {
-    enum StickerSet: TypeConstructorDescription {
+    indirect enum StickerSet: TypeConstructorDescription {
         case stickerSet(set: Api.StickerSet, packs: [Api.StickerPack], documents: [Api.Document])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1371,7 +1371,7 @@ struct messages {
         }
     
     }
-    enum ArchivedStickers: TypeConstructorDescription {
+    indirect enum ArchivedStickers: TypeConstructorDescription {
         case archivedStickers(count: Int32, sets: [Api.StickerSetCovered])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1415,7 +1415,7 @@ struct messages {
         }
     
     }
-    enum SentEncryptedMessage: TypeConstructorDescription {
+    indirect enum SentEncryptedMessage: TypeConstructorDescription {
         case sentEncryptedMessage(date: Int32)
         case sentEncryptedFile(date: Int32, file: Api.EncryptedFile)
     
@@ -1475,7 +1475,7 @@ struct messages {
         }
     
     }
-    enum Stickers: TypeConstructorDescription {
+    indirect enum Stickers: TypeConstructorDescription {
         case stickersNotModified
         case stickers(hash: Int32, stickers: [Api.Document])
     
@@ -1531,7 +1531,7 @@ struct messages {
         }
     
     }
-    enum FoundStickerSets: TypeConstructorDescription {
+    indirect enum FoundStickerSets: TypeConstructorDescription {
         case foundStickerSetsNotModified
         case foundStickerSets(hash: Int32, sets: [Api.StickerSetCovered])
     
@@ -1587,7 +1587,7 @@ struct messages {
         }
     
     }
-    enum FoundGifs: TypeConstructorDescription {
+    indirect enum FoundGifs: TypeConstructorDescription {
         case foundGifs(nextOffset: Int32, results: [Api.FoundGif])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1631,7 +1631,7 @@ struct messages {
         }
     
     }
-    enum BotResults: TypeConstructorDescription {
+    indirect enum BotResults: TypeConstructorDescription {
         case botResults(flags: Int32, queryId: Int64, nextOffset: String?, switchPm: Api.InlineBotSwitchPM?, results: [Api.BotInlineResult], cacheTime: Int32, users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1703,7 +1703,7 @@ struct messages {
         }
     
     }
-    enum BotCallbackAnswer: TypeConstructorDescription {
+    indirect enum BotCallbackAnswer: TypeConstructorDescription {
         case botCallbackAnswer(flags: Int32, message: String?, url: String?, cacheTime: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1749,7 +1749,7 @@ struct messages {
         }
     
     }
-    enum Chats: TypeConstructorDescription {
+    indirect enum Chats: TypeConstructorDescription {
         case chats(chats: [Api.Chat])
         case chatsSlice(count: Int32, chats: [Api.Chat])
     
@@ -1819,7 +1819,7 @@ struct messages {
         }
     
     }
-    enum DhConfig: TypeConstructorDescription {
+    indirect enum DhConfig: TypeConstructorDescription {
         case dhConfigNotModified(random: Buffer)
         case dhConfig(g: Int32, p: Buffer, version: Int32, random: Buffer)
     
@@ -1885,7 +1885,7 @@ struct messages {
         }
     
     }
-    enum AffectedHistory: TypeConstructorDescription {
+    indirect enum AffectedHistory: TypeConstructorDescription {
         case affectedHistory(pts: Int32, ptsCount: Int32, offset: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1927,7 +1927,7 @@ struct messages {
         }
     
     }
-    enum MessageEditData: TypeConstructorDescription {
+    indirect enum MessageEditData: TypeConstructorDescription {
         case messageEditData(flags: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1961,7 +1961,7 @@ struct messages {
         }
     
     }
-    enum ChatFull: TypeConstructorDescription {
+    indirect enum ChatFull: TypeConstructorDescription {
         case chatFull(fullChat: Api.ChatFull, chats: [Api.Chat], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -2017,7 +2017,7 @@ struct messages {
         }
     
     }
-    enum StickerSetInstallResult: TypeConstructorDescription {
+    indirect enum StickerSetInstallResult: TypeConstructorDescription {
         case stickerSetInstallResultSuccess
         case stickerSetInstallResultArchive(sets: [Api.StickerSetCovered])
     
@@ -2069,7 +2069,7 @@ struct messages {
         }
     
     }
-    enum AffectedMessages: TypeConstructorDescription {
+    indirect enum AffectedMessages: TypeConstructorDescription {
         case affectedMessages(pts: Int32, ptsCount: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -2107,7 +2107,7 @@ struct messages {
         }
     
     }
-    enum SavedGifs: TypeConstructorDescription {
+    indirect enum SavedGifs: TypeConstructorDescription {
         case savedGifsNotModified
         case savedGifs(hash: Int32, gifs: [Api.Document])
     
@@ -2163,7 +2163,7 @@ struct messages {
         }
     
     }
-    enum Messages: TypeConstructorDescription {
+    indirect enum Messages: TypeConstructorDescription {
         case messages(messages: [Api.Message], chats: [Api.Chat], users: [Api.User])
         case messagesNotModified(count: Int32)
         case messagesSlice(flags: Int32, count: Int32, messages: [Api.Message], chats: [Api.Chat], users: [Api.User])
@@ -2355,7 +2355,7 @@ struct messages {
         }
     
     }
-    enum PeerDialogs: TypeConstructorDescription {
+    indirect enum PeerDialogs: TypeConstructorDescription {
         case peerDialogs(dialogs: [Api.Dialog], messages: [Api.Message], chats: [Api.Chat], users: [Api.User], state: Api.updates.State)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -2431,7 +2431,7 @@ struct messages {
         }
     
     }
-    enum RecentStickers: TypeConstructorDescription {
+    indirect enum RecentStickers: TypeConstructorDescription {
         case recentStickersNotModified
         case recentStickers(hash: Int32, packs: [Api.StickerPack], stickers: [Api.Document], dates: [Int32])
     
@@ -2507,7 +2507,7 @@ struct messages {
         }
     
     }
-    enum FeaturedStickers: TypeConstructorDescription {
+    indirect enum FeaturedStickers: TypeConstructorDescription {
         case featuredStickersNotModified
         case featuredStickers(hash: Int32, sets: [Api.StickerSetCovered], unread: [Int64])
     
@@ -2573,7 +2573,7 @@ struct messages {
         }
     
     }
-    enum Dialogs: TypeConstructorDescription {
+    indirect enum Dialogs: TypeConstructorDescription {
         case dialogs(dialogs: [Api.Dialog], messages: [Api.Message], chats: [Api.Chat], users: [Api.User])
         case dialogsSlice(count: Int32, dialogs: [Api.Dialog], messages: [Api.Message], chats: [Api.Chat], users: [Api.User])
         case dialogsNotModified(count: Int32)
@@ -2723,7 +2723,7 @@ struct messages {
         }
     
     }
-    enum FavedStickers: TypeConstructorDescription {
+    indirect enum FavedStickers: TypeConstructorDescription {
         case favedStickersNotModified
         case favedStickers(hash: Int32, packs: [Api.StickerPack], stickers: [Api.Document])
     
@@ -2789,7 +2789,7 @@ struct messages {
         }
     
     }
-    enum AllStickers: TypeConstructorDescription {
+    indirect enum AllStickers: TypeConstructorDescription {
         case allStickersNotModified
         case allStickers(hash: Int32, sets: [Api.StickerSet])
     
@@ -2845,7 +2845,7 @@ struct messages {
         }
     
     }
-    enum HighScores: TypeConstructorDescription {
+    indirect enum HighScores: TypeConstructorDescription {
         case highScores(scores: [Api.HighScore], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {

TelegramCore/Api2.swift

@@ -1,6 +1,6 @@
 extension Api {
 struct channels {
-    enum ChannelParticipants: TypeConstructorDescription {
+    indirect enum ChannelParticipants: TypeConstructorDescription {
         case channelParticipants(count: Int32, participants: [Api.ChannelParticipant], users: [Api.User])
         case channelParticipantsNotModified
     
@@ -66,7 +66,7 @@ struct channels {
         }
     
     }
-    enum ChannelParticipant: TypeConstructorDescription {
+    indirect enum ChannelParticipant: TypeConstructorDescription {
         case channelParticipant(participant: Api.ChannelParticipant, users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -112,7 +112,7 @@ struct channels {
         }
     
     }
-    enum AdminLogResults: TypeConstructorDescription {
+    indirect enum AdminLogResults: TypeConstructorDescription {
         case adminLogResults(events: [Api.ChannelAdminLogEvent], chats: [Api.Chat], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -176,7 +176,7 @@ struct channels {
 }
 extension Api {
 struct payments {
-    enum ValidatedRequestedInfo: TypeConstructorDescription {
+    indirect enum ValidatedRequestedInfo: TypeConstructorDescription {
         case validatedRequestedInfo(flags: Int32, id: String?, shippingOptions: [Api.ShippingOption]?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -224,7 +224,7 @@ struct payments {
         }
     
     }
-    enum PaymentResult: TypeConstructorDescription {
+    indirect enum PaymentResult: TypeConstructorDescription {
         case paymentResult(updates: Api.Updates)
         case paymentVerficationNeeded(url: String)
     
@@ -280,7 +280,7 @@ struct payments {
         }
     
     }
-    enum PaymentForm: TypeConstructorDescription {
+    indirect enum PaymentForm: TypeConstructorDescription {
         case paymentForm(flags: Int32, botId: Int32, invoice: Api.Invoice, providerId: Int32, url: String, nativeProvider: String?, nativeParams: Api.DataJSON?, savedInfo: Api.PaymentRequestedInfo?, savedCredentials: Api.PaymentSavedCredentials?, users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -364,7 +364,7 @@ struct payments {
         }
     
     }
-    enum PaymentReceipt: TypeConstructorDescription {
+    indirect enum PaymentReceipt: TypeConstructorDescription {
         case paymentReceipt(flags: Int32, date: Int32, botId: Int32, invoice: Api.Invoice, providerId: Int32, info: Api.PaymentRequestedInfo?, shipping: Api.ShippingOption?, currency: String, totalAmount: Int64, credentialsTitle: String, users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -450,7 +450,7 @@ struct payments {
         }
     
     }
-    enum SavedInfo: TypeConstructorDescription {
+    indirect enum SavedInfo: TypeConstructorDescription {
         case savedInfo(flags: Int32, savedInfo: Api.PaymentRequestedInfo?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -494,7 +494,7 @@ struct payments {
 }
 extension Api {
 struct auth {
-    enum Authorization: TypeConstructorDescription {
+    indirect enum Authorization: TypeConstructorDescription {
         case authorization(flags: Int32, tmpSessions: Int32?, user: Api.User)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -538,7 +538,7 @@ struct auth {
         }
     
     }
-    enum PasswordRecovery: TypeConstructorDescription {
+    indirect enum PasswordRecovery: TypeConstructorDescription {
         case passwordRecovery(emailPattern: String)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -572,7 +572,7 @@ struct auth {
         }
     
     }
-    enum ExportedAuthorization: TypeConstructorDescription {
+    indirect enum ExportedAuthorization: TypeConstructorDescription {
         case exportedAuthorization(id: Int32, bytes: Buffer)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -610,7 +610,7 @@ struct auth {
         }
     
     }
-    enum CheckedPhone: TypeConstructorDescription {
+    indirect enum CheckedPhone: TypeConstructorDescription {
         case checkedPhone(phoneRegistered: Api.Bool)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -646,7 +646,7 @@ struct auth {
         }
     
     }
-    enum SentCode: TypeConstructorDescription {
+    indirect enum SentCode: TypeConstructorDescription {
         case sentCode(flags: Int32, type: Api.auth.SentCodeType, phoneCodeHash: String, nextType: Api.auth.CodeType?, timeout: Int32?, termsOfService: Api.help.TermsOfService?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -706,7 +706,7 @@ struct auth {
         }
     
     }
-    enum CodeType: TypeConstructorDescription {
+    indirect enum CodeType: TypeConstructorDescription {
         case codeTypeSms
         case codeTypeCall
         case codeTypeFlashCall
@@ -756,7 +756,7 @@ struct auth {
         }
     
     }
-    enum SentCodeType: TypeConstructorDescription {
+    indirect enum SentCodeType: TypeConstructorDescription {
         case sentCodeTypeApp(length: Int32)
         case sentCodeTypeSms(length: Int32)
         case sentCodeTypeCall(length: Int32)
@@ -854,7 +854,7 @@ struct auth {
 }
 extension Api {
 struct contacts {
-    enum Blocked: TypeConstructorDescription {
+    indirect enum Blocked: TypeConstructorDescription {
         case blocked(blocked: [Api.ContactBlocked], users: [Api.User])
         case blockedSlice(count: Int32, blocked: [Api.ContactBlocked], users: [Api.User])
     
@@ -944,7 +944,7 @@ struct contacts {
         }
     
     }
-    enum Contacts: TypeConstructorDescription {
+    indirect enum Contacts: TypeConstructorDescription {
         case contactsNotModified
         case contacts(contacts: [Api.Contact], savedCount: Int32, users: [Api.User])
     
@@ -1010,7 +1010,7 @@ struct contacts {
         }
     
     }
-    enum ResolvedPeer: TypeConstructorDescription {
+    indirect enum ResolvedPeer: TypeConstructorDescription {
         case resolvedPeer(peer: Api.Peer, chats: [Api.Chat], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1066,7 +1066,7 @@ struct contacts {
         }
     
     }
-    enum Link: TypeConstructorDescription {
+    indirect enum Link: TypeConstructorDescription {
         case link(myLink: Api.ContactLink, foreignLink: Api.ContactLink, user: Api.User)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1114,7 +1114,7 @@ struct contacts {
         }
     
     }
-    enum ImportedContacts: TypeConstructorDescription {
+    indirect enum ImportedContacts: TypeConstructorDescription {
         case importedContacts(imported: [Api.ImportedContact], popularInvites: [Api.PopularContact], retryContacts: [Int64], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1184,7 +1184,7 @@ struct contacts {
         }
     
     }
-    enum Found: TypeConstructorDescription {
+    indirect enum Found: TypeConstructorDescription {
         case found(myResults: [Api.Peer], results: [Api.Peer], chats: [Api.Chat], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1254,7 +1254,7 @@ struct contacts {
         }
     
     }
-    enum TopPeers: TypeConstructorDescription {
+    indirect enum TopPeers: TypeConstructorDescription {
         case topPeersNotModified
         case topPeers(categories: [Api.TopPeerCategoryPeers], chats: [Api.Chat], users: [Api.User])
         case topPeersDisabled
@@ -1342,7 +1342,7 @@ struct contacts {
 }
 extension Api {
 struct help {
-    enum AppUpdate: TypeConstructorDescription {
+    indirect enum AppUpdate: TypeConstructorDescription {
         case appUpdate(id: Int32, critical: Api.Bool, url: String, text: String)
         case noAppUpdate
     
@@ -1402,7 +1402,7 @@ struct help {
         }
     
     }
-    enum PassportConfig: TypeConstructorDescription {
+    indirect enum PassportConfig: TypeConstructorDescription {
         case passportConfigNotModified
         case passportConfig(hash: Int32, countriesLangs: Api.DataJSON)
     
@@ -1454,7 +1454,7 @@ struct help {
         }
     
     }
-    enum ProxyData: TypeConstructorDescription {
+    indirect enum ProxyData: TypeConstructorDescription {
         case proxyDataEmpty(expires: Int32)
         case proxyDataPromo(expires: Int32, peer: Api.Peer, chats: [Api.Chat], users: [Api.User])
     
@@ -1534,7 +1534,7 @@ struct help {
         }
     
     }
-    enum DeepLinkInfo: TypeConstructorDescription {
+    indirect enum DeepLinkInfo: TypeConstructorDescription {
         case deepLinkInfoEmpty
         case deepLinkInfo(flags: Int32, message: String, entities: [Api.MessageEntity]?)
     
@@ -1594,7 +1594,7 @@ struct help {
         }
     
     }
-    enum TermsOfService: TypeConstructorDescription {
+    indirect enum TermsOfService: TypeConstructorDescription {
         case termsOfService(flags: Int32, id: Api.DataJSON, text: String, entities: [Api.MessageEntity], minAgeConfirm: Int32?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1652,7 +1652,7 @@ struct help {
         }
     
     }
-    enum RecentMeUrls: TypeConstructorDescription {
+    indirect enum RecentMeUrls: TypeConstructorDescription {
         case recentMeUrls(urls: [Api.RecentMeUrl], chats: [Api.Chat], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1712,7 +1712,7 @@ struct help {
         }
     
     }
-    enum Support: TypeConstructorDescription {
+    indirect enum Support: TypeConstructorDescription {
         case support(phoneNumber: String, user: Api.User)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1752,7 +1752,7 @@ struct help {
         }
     
     }
-    enum InviteText: TypeConstructorDescription {
+    indirect enum InviteText: TypeConstructorDescription {
         case inviteText(message: String)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -1786,7 +1786,7 @@ struct help {
         }
     
     }
-    enum TermsOfServiceUpdate: TypeConstructorDescription {
+    indirect enum TermsOfServiceUpdate: TypeConstructorDescription {
         case termsOfServiceUpdateEmpty(expires: Int32)
         case termsOfServiceUpdate(expires: Int32, termsOfService: Api.help.TermsOfService)
     
@@ -1850,7 +1850,7 @@ struct help {
 }
 extension Api {
 struct updates {
-    enum Difference: TypeConstructorDescription {
+    indirect enum Difference: TypeConstructorDescription {
         case differenceEmpty(date: Int32, seq: Int32)
         case difference(newMessages: [Api.Message], newEncryptedMessages: [Api.EncryptedMessage], otherUpdates: [Api.Update], chats: [Api.Chat], users: [Api.User], state: Api.updates.State)
         case differenceSlice(newMessages: [Api.Message], newEncryptedMessages: [Api.EncryptedMessage], otherUpdates: [Api.Update], chats: [Api.Chat], users: [Api.User], intermediateState: Api.updates.State)
@@ -2052,7 +2052,7 @@ struct updates {
         }
     
     }
-    enum State: TypeConstructorDescription {
+    indirect enum State: TypeConstructorDescription {
         case state(pts: Int32, qts: Int32, date: Int32, seq: Int32, unreadCount: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -2102,7 +2102,7 @@ struct updates {
         }
     
     }
-    enum ChannelDifference: TypeConstructorDescription {
+    indirect enum ChannelDifference: TypeConstructorDescription {
         case channelDifferenceEmpty(flags: Int32, pts: Int32, timeout: Int32?)
         case channelDifference(flags: Int32, pts: Int32, timeout: Int32?, newMessages: [Api.Message], otherUpdates: [Api.Update], chats: [Api.Chat], users: [Api.User])
         case channelDifferenceTooLong(flags: Int32, timeout: Int32?, dialog: Api.Dialog, messages: [Api.Message], chats: [Api.Chat], users: [Api.User])

TelegramCore/Api3.swift

@@ -1,6 +1,6 @@
 extension Api {
 struct upload {
-    enum WebFile: TypeConstructorDescription {
+    indirect enum WebFile: TypeConstructorDescription {
         case webFile(size: Int32, mimeType: String, fileType: Api.storage.FileType, mtime: Int32, bytes: Buffer)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -52,7 +52,7 @@ struct upload {
         }
     
     }
-    enum File: TypeConstructorDescription {
+    indirect enum File: TypeConstructorDescription {
         case file(type: Api.storage.FileType, mtime: Int32, bytes: Buffer)
         case fileCdnRedirect(dcId: Int32, fileToken: Buffer, encryptionKey: Buffer, encryptionIv: Buffer, fileHashes: [Api.FileHash])
     
@@ -138,7 +138,7 @@ struct upload {
         }
     
     }
-    enum CdnFile: TypeConstructorDescription {
+    indirect enum CdnFile: TypeConstructorDescription {
         case cdnFileReuploadNeeded(requestToken: Buffer)
         case cdnFile(bytes: Buffer)
     
@@ -196,7 +196,7 @@ struct upload {
 }
 extension Api {
 struct storage {
-    enum FileType: TypeConstructorDescription {
+    indirect enum FileType: TypeConstructorDescription {
         case fileUnknown
         case filePartial
         case fileJpeg
@@ -334,7 +334,7 @@ struct storage {
 }
 extension Api {
 struct account {
-    enum TmpPassword: TypeConstructorDescription {
+    indirect enum TmpPassword: TypeConstructorDescription {
         case tmpPassword(tmpPassword: Buffer, validUntil: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -372,7 +372,7 @@ struct account {
         }
     
     }
-    enum PasswordSettings: TypeConstructorDescription {
+    indirect enum PasswordSettings: TypeConstructorDescription {
         case passwordSettings(flags: Int32, email: String?, secureSettings: Api.SecureSecretSettings?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -416,7 +416,7 @@ struct account {
         }
     
     }
-    enum WallPapers: TypeConstructorDescription {
+    indirect enum WallPapers: TypeConstructorDescription {
         case wallPapersNotModified
         case wallPapers(hash: Int32, wallpapers: [Api.WallPaper])
     
@@ -472,7 +472,7 @@ struct account {
         }
     
     }
-    enum PasswordInputSettings: TypeConstructorDescription {
+    indirect enum PasswordInputSettings: TypeConstructorDescription {
         case passwordInputSettings(flags: Int32, newAlgo: Api.PasswordKdfAlgo?, newPasswordHash: Buffer?, hint: String?, email: String?, newSecureSettings: Api.SecureSecretSettings?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -530,7 +530,7 @@ struct account {
         }
     
     }
-    enum WebAuthorizations: TypeConstructorDescription {
+    indirect enum WebAuthorizations: TypeConstructorDescription {
         case webAuthorizations(authorizations: [Api.WebAuthorization], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -580,7 +580,7 @@ struct account {
         }
     
     }
-    enum SentEmailCode: TypeConstructorDescription {
+    indirect enum SentEmailCode: TypeConstructorDescription {
         case sentEmailCode(emailPattern: String, length: Int32)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -618,7 +618,7 @@ struct account {
         }
     
     }
-    enum Authorizations: TypeConstructorDescription {
+    indirect enum Authorizations: TypeConstructorDescription {
         case authorizations(authorizations: [Api.Authorization])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -658,7 +658,7 @@ struct account {
         }
     
     }
-    enum AuthorizationForm: TypeConstructorDescription {
+    indirect enum AuthorizationForm: TypeConstructorDescription {
         case authorizationForm(flags: Int32, requiredTypes: [Api.SecureRequiredType], values: [Api.SecureValue], errors: [Api.SecureValueError], users: [Api.User], privacyPolicyUrl: String?)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -736,7 +736,7 @@ struct account {
         }
     
     }
-    enum Password: TypeConstructorDescription {
+    indirect enum Password: TypeConstructorDescription {
         case password(flags: Int32, currentAlgo: Api.PasswordKdfAlgo?, srpB: Buffer?, srpId: Int64?, hint: String?, emailUnconfirmedPattern: String?, newAlgo: Api.PasswordKdfAlgo, newSecureAlgo: Api.SecurePasswordKdfAlgo, secureRandom: Buffer)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -808,7 +808,7 @@ struct account {
         }
     
     }
-    enum PrivacyRules: TypeConstructorDescription {
+    indirect enum PrivacyRules: TypeConstructorDescription {
         case privacyRules(rules: [Api.PrivacyRule], users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -858,7 +858,7 @@ struct account {
         }
     
     }
-    enum AutoDownloadSettings: TypeConstructorDescription {
+    indirect enum AutoDownloadSettings: TypeConstructorDescription {
         case autoDownloadSettings(low: Api.AutoDownloadSettings, medium: Api.AutoDownloadSettings, high: Api.AutoDownloadSettings)
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -910,7 +910,7 @@ struct account {
 }
 extension Api {
 struct photos {
-    enum Photo: TypeConstructorDescription {
+    indirect enum Photo: TypeConstructorDescription {
         case photo(photo: Api.Photo, users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -956,7 +956,7 @@ struct photos {
         }
     
     }
-    enum Photos: TypeConstructorDescription {
+    indirect enum Photos: TypeConstructorDescription {
         case photos(photos: [Api.Photo], users: [Api.User])
         case photosSlice(count: Int32, photos: [Api.Photo], users: [Api.User])
     
@@ -1050,7 +1050,7 @@ struct photos {
 }
 extension Api {
 struct phone {
-    enum PhoneCall: TypeConstructorDescription {
+    indirect enum PhoneCall: TypeConstructorDescription {
         case phoneCall(phoneCall: Api.PhoneCall, users: [Api.User])
     
     func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {

TelegramCore/ImportAccount.swift

@@ -1,49 +0,0 @@
-import Foundation
-#if os(macOS)
-    import PostboxMac
-    import SwiftSignalKitMac
-#else
-    import Postbox
-    import SwiftSignalKit
-#endif
-
-public struct ImportAccountProvider {
-    let mtProtoKeychain: () -> Signal<[String: [String: Data]], NoError>
-    let accountState: () -> Signal<AccountState, NoError>
-    let peers: () -> Signal<[Peer], NoError>
-    
-    public init(mtProtoKeychain: @escaping () -> Signal<[String: [String: Data]], NoError>, accountState: @escaping() -> Signal<AccountState, NoError>, peers: @escaping() -> Signal<[Peer], NoError>) {
-        self.mtProtoKeychain = mtProtoKeychain
-        self.accountState = accountState
-        self.peers = peers
-    }
-}
-
-public func importAccount(account: UnauthorizedAccount, provider: ImportAccountProvider) -> Signal<Void, NoError> {
-    return provider.mtProtoKeychain()
-        |> mapToSignal { keychain -> Signal<Void, NoError> in
-            for (group, dict) in keychain {
-                for (key, value) in dict {
-                    account.postbox.setKeychainEntryForKey(group + ":" + key, value: value)
-                }
-            }
-            
-            let importAccountState = provider.accountState()
-                |> mapToSignal { accountState -> Signal<Void, NoError> in
-                    return account.postbox.transaction { transaction -> Void in
-                        transaction.setState(accountState)
-                    }
-                }
-            
-            let importPeers = provider.peers()
-                |> mapToSignal { peers -> Signal<Void, NoError> in
-                    return account.postbox.transaction { transaction -> Void in
-                        updatePeers(transaction: transaction, peers: peers, update: { _, updated in
-                            return updated
-                        })
-                    }
-                }
-            
-            return (importAccountState |> then(importPeers)) |> mapToSignal { _ in return .complete() } |> then(.single(Void()))
-        }
-}