diff --git a/submodules/MtProtoKit/MtProtoKit_Xcode.xcodeproj/project.pbxproj b/submodules/MtProtoKit/MtProtoKit_Xcode.xcodeproj/project.pbxproj index d36988960d..5755373742 100644 --- a/submodules/MtProtoKit/MtProtoKit_Xcode.xcodeproj/project.pbxproj +++ b/submodules/MtProtoKit/MtProtoKit_Xcode.xcodeproj/project.pbxproj @@ -3088,6 +3088,253 @@ }; name = DebugFork; }; + D0364D4722B3E35B002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_MODULES_AUTOLINK = NO; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + }; + name = HockeyappMacAlpha; + }; + D0364D4822B3E35B002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/Telegraph-dzhgyeoibunjpxfckifwvbawfdmi/Build/Products/Debug-iphoneos", + ); + GCC_NO_COMMON_BLOCKS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "MtProtoKitiOS/MtProtoKit-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(PROJECT_DIR)/openssl", + ); + INFOPLIST_FILE = MtProtoKit/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/openssl/iOS", + ); + MACH_O_TYPE = staticlib; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = "-lz"; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_MODULE_NAME = MtProtoKit; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = X834Q8SBVP/; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0364D4922B3E35B002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + "BETA=1", + ); + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/openssl"; + INFOPLIST_FILE = MtProtoKitMac/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/openssl/OSX", + ); + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-DMtProtoKitMacFramework=1"; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0364D4A22B3E35B002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEPLOYMENT_POSTPROCESSING = NO; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/thirdparty", + ); + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/openssl"; + INFOPLIST_FILE = MtProtoKitDynamic/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/openssl/iOS", + ); + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-DMtProtoKitDynamicFramework=1"; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SEPARATE_STRIP = NO; + SKIP_INSTALL = YES; + STRIPFLAGS = ""; + STRIP_STYLE = debugging; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0364D4B22B3E35B002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = MtProtoKitDynamicTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = HockeyappMacAlpha; + }; + D0364D4C22B3E35B002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = MtProtoKitStabilityTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.MtProtoKitStabilityTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = HockeyappMacAlpha; + }; D05A833A18AFB3F9007F1076 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -5354,6 +5601,7 @@ buildConfigurations = ( D003546D1C173BF0006610DA /* Debug */, D079FD151F06BE440038FADE /* DebugHockeyapp */, + D0364D4C22B3E35B002A6EF0 /* HockeyappMacAlpha */, D021D501219CB1CD0064BEBA /* DebugFork */, D0DB57B51E5C4B470071854C /* DebugAppStore */, D0ADF92D212B3ACC00310BBC /* DebugAppStoreLLC */, @@ -5374,6 +5622,7 @@ buildConfigurations = ( D05A833A18AFB3F9007F1076 /* Debug */, D079FD101F06BE440038FADE /* DebugHockeyapp */, + D0364D4722B3E35B002A6EF0 /* HockeyappMacAlpha */, D021D4FC219CB1CD0064BEBA /* DebugFork */, D0DB57B01E5C4B470071854C /* DebugAppStore */, D0ADF928212B3ACC00310BBC /* DebugAppStoreLLC */, @@ -5394,6 +5643,7 @@ buildConfigurations = ( D079ABAA1AF39B8000076F59 /* Debug */, D079FD121F06BE440038FADE /* DebugHockeyapp */, + D0364D4922B3E35B002A6EF0 /* HockeyappMacAlpha */, D021D4FE219CB1CD0064BEBA /* DebugFork */, D0DB57B21E5C4B470071854C /* DebugAppStore */, D0ADF92A212B3ACC00310BBC /* DebugAppStoreLLC */, @@ -5414,6 +5664,7 @@ buildConfigurations = ( D0CB060A1ADC4483005E298F /* Debug */, D079FD111F06BE440038FADE /* DebugHockeyapp */, + D0364D4822B3E35B002A6EF0 /* HockeyappMacAlpha */, D021D4FD219CB1CD0064BEBA /* DebugFork */, D0DB57B11E5C4B470071854C /* DebugAppStore */, D0ADF929212B3ACC00310BBC /* DebugAppStoreLLC */, @@ -5434,6 +5685,7 @@ buildConfigurations = ( D0D2251E1B4D817B0085E26D /* Debug */, D079FD131F06BE440038FADE /* DebugHockeyapp */, + D0364D4A22B3E35B002A6EF0 /* HockeyappMacAlpha */, D021D4FF219CB1CD0064BEBA /* DebugFork */, D0DB57B31E5C4B470071854C /* DebugAppStore */, D0ADF92B212B3ACC00310BBC /* DebugAppStoreLLC */, @@ -5454,6 +5706,7 @@ buildConfigurations = ( D0D225201B4D817B0085E26D /* Debug */, D079FD141F06BE440038FADE /* DebugHockeyapp */, + D0364D4B22B3E35B002A6EF0 /* HockeyappMacAlpha */, D021D500219CB1CD0064BEBA /* DebugFork */, D0DB57B41E5C4B470071854C /* DebugAppStore */, D0ADF92C212B3ACC00310BBC /* DebugAppStoreLLC */, diff --git a/submodules/Postbox/Postbox_Xcode.xcodeproj/project.pbxproj b/submodules/Postbox/Postbox_Xcode.xcodeproj/project.pbxproj index b661a6eb47..4f21df125b 100644 --- a/submodules/Postbox/Postbox_Xcode.xcodeproj/project.pbxproj +++ b/submodules/Postbox/Postbox_Xcode.xcodeproj/project.pbxproj @@ -1886,6 +1886,161 @@ }; name = DebugFork; }; + D0364D5122B3E385002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D07516491B2D9E2500AE42E0 /* Postbox.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0364D5222B3E385002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D07516491B2D9E2500AE42E0 /* Postbox.xcconfig */; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + DEAD_CODE_STRIPPING = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = YES; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = Postbox/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = mh_dylib; + OTHER_CFLAGS = ( + "-DSQLITE_HAS_CODEC=1", + "-DSQLCIPHER_CRYPTO_CC=1", + "-DSQLITE_ENABLE_FTS5", + "-DSQLITE_DEFAULT_MEMSTATUS=0", + "-DNDEBUG", + ); + OTHER_SWIFT_FLAGS = "-DDEBUG"; + PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + STRIP_SWIFT_SYMBOLS = YES; + SWIFT_COMPILATION_MODE = singlefile; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_REFLECTION_METADATA_LEVEL = all; + SWIFT_VERSION = 4.2; + }; + name = HockeyappMacAlpha; + }; + D0364D5322B3E385002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D07516491B2D9E2500AE42E0 /* Postbox.xcconfig */; + buildSettings = { + DEVELOPMENT_TEAM = ""; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "/Users/peter/Documents/PostBoxTest/submodules/SSignalKit/build/Debug-iphoneos", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = PostboxTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 3.0; + }; + name = HockeyappMacAlpha; + }; + D0364D5422B3E385002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CODE_SIGN_IDENTITY = "Mac Developer"; + COMBINE_HIDPI_IMAGES = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + GCC_OPTIMIZATION_LEVEL = s; + INFOPLIST_FILE = PostboxMac/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MODULEMAP_PRIVATE_FILE = "$(SRCROOT)/Postbox/module.private-mac.modulemap"; + OTHER_CFLAGS = ( + "-DSQLITE_HAS_CODEC=1", + "-DSQLCIPHER_CRYPTO_CC=1", + "-DSQLITE_ENABLE_FTS5", + "-DSQLITE_DEFAULT_MEMSTATUS=0", + "-DNDEBUG", + ); + OTHER_SWIFT_FLAGS = "-DDEBUG"; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.PostboxMac; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 4.2; + }; + name = HockeyappMacAlpha; + }; D079FD0C1F06BE070038FADE /* DebugAppStore */ = { isa = XCBuildConfiguration; baseConfigurationReference = D07516491B2D9E2500AE42E0 /* Postbox.xcconfig */; @@ -2769,6 +2924,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0B418181D7DFAF3004562A4 /* DebugHockeyapp */, + D0364D5422B3E385002A6EF0 /* HockeyappMacAlpha */, D021D4FB219CB1B90064BEBA /* DebugFork */, D079FD0F1F06BE070038FADE /* DebugAppStore */, D0ADF927212B3AC400310BBC /* DebugAppStoreLLC */, @@ -2784,6 +2940,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0E3A75E1B28A7E300A402D9 /* DebugHockeyapp */, + D0364D5122B3E385002A6EF0 /* HockeyappMacAlpha */, D021D4F8219CB1B90064BEBA /* DebugFork */, D079FD0C1F06BE070038FADE /* DebugAppStore */, D0ADF924212B3AC400310BBC /* DebugAppStoreLLC */, @@ -2799,6 +2956,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0E3A7611B28A7E300A402D9 /* DebugHockeyapp */, + D0364D5222B3E385002A6EF0 /* HockeyappMacAlpha */, D021D4F9219CB1B90064BEBA /* DebugFork */, D079FD0D1F06BE070038FADE /* DebugAppStore */, D0ADF925212B3AC400310BBC /* DebugAppStoreLLC */, @@ -2814,6 +2972,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0E3A7641B28A7E300A402D9 /* DebugHockeyapp */, + D0364D5322B3E385002A6EF0 /* HockeyappMacAlpha */, D021D4FA219CB1B90064BEBA /* DebugFork */, D079FD0E1F06BE070038FADE /* DebugAppStore */, D0ADF926212B3AC400310BBC /* DebugAppStoreLLC */, diff --git a/submodules/SSignalKit/SSignalKit_Xcode.xcodeproj/project.pbxproj b/submodules/SSignalKit/SSignalKit_Xcode.xcodeproj/project.pbxproj index 9eeafa5aba..187ad2873e 100644 --- a/submodules/SSignalKit/SSignalKit_Xcode.xcodeproj/project.pbxproj +++ b/submodules/SSignalKit/SSignalKit_Xcode.xcodeproj/project.pbxproj @@ -1145,6 +1145,189 @@ }; name = DebugFork; }; + D0364D5522B3E38E002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + ENABLE_BITCODE = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0364D5622B3E38E002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = YES; + INFOPLIST_FILE = SSignalKit/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + ONLY_ACTIVE_ARCH = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = X834Q8SBVP/; + SKIP_INSTALL = YES; + }; + name = HockeyappMacAlpha; + }; + D0364D5722B3E38E002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = SSignalKitTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-framework", + XCTest, + "-ObjC", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = HockeyappMacAlpha; + }; + D0364D5822B3E38E002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + ARCHS = "$(ARCHS_STANDARD)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = SwiftSignalKit/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + OTHER_SWIFT_FLAGS = ""; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_REFLECTION_METADATA_LEVEL = none; + SWIFT_VERSION = 4.0; + }; + name = HockeyappMacAlpha; + }; + D0364D5922B3E38E002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + ); + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 8.3; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; + }; + name = HockeyappMacAlpha; + }; + D0364D5A22B3E38E002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; + }; + name = HockeyappMacAlpha; + }; D0445DEC1A7C2CA500267924 /* DebugHockeyapp */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2256,6 +2439,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0085B361B282B9800EAF753 /* DebugHockeyapp */, + D0364D5822B3E38E002A6EF0 /* HockeyappMacAlpha */, D021D505219CB1D90064BEBA /* DebugFork */, D0DB57B91E5C4B7A0071854C /* DebugAppStore */, D0ADF931212B3AD400310BBC /* DebugAppStoreLLC */, @@ -2271,6 +2455,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0085B391B282B9800EAF753 /* DebugHockeyapp */, + D0364D5922B3E38E002A6EF0 /* HockeyappMacAlpha */, D021D506219CB1D90064BEBA /* DebugFork */, D0DB57BA1E5C4B7A0071854C /* DebugAppStore */, D0ADF932212B3AD400310BBC /* DebugAppStoreLLC */, @@ -2286,6 +2471,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0445DEC1A7C2CA500267924 /* DebugHockeyapp */, + D0364D5522B3E38E002A6EF0 /* HockeyappMacAlpha */, D021D502219CB1D90064BEBA /* DebugFork */, D0DB57B61E5C4B7A0071854C /* DebugAppStore */, D0ADF92E212B3AD400310BBC /* DebugAppStoreLLC */, @@ -2301,6 +2487,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0445DEF1A7C2CA500267924 /* DebugHockeyapp */, + D0364D5622B3E38E002A6EF0 /* HockeyappMacAlpha */, D021D503219CB1D90064BEBA /* DebugFork */, D0DB57B71E5C4B7A0071854C /* DebugAppStore */, D0ADF92F212B3AD400310BBC /* DebugAppStoreLLC */, @@ -2316,6 +2503,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0445DF21A7C2CA500267924 /* DebugHockeyapp */, + D0364D5722B3E38E002A6EF0 /* HockeyappMacAlpha */, D021D504219CB1D90064BEBA /* DebugFork */, D0DB57B81E5C4B7A0071854C /* DebugAppStore */, D0ADF930212B3AD400310BBC /* DebugAppStoreLLC */, @@ -2331,6 +2519,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0B417F31D7DFA63004562A4 /* DebugHockeyapp */, + D0364D5A22B3E38E002A6EF0 /* HockeyappMacAlpha */, D021D507219CB1D90064BEBA /* DebugFork */, D0DB57BB1E5C4B7A0071854C /* DebugAppStore */, D0ADF933212B3AD400310BBC /* DebugAppStoreLLC */, diff --git a/submodules/SSignalKit/SwiftSignalKit/Timer.swift b/submodules/SSignalKit/SwiftSignalKit/Timer.swift index d52aaae3ea..af8738dd1f 100644 --- a/submodules/SSignalKit/SwiftSignalKit/Timer.swift +++ b/submodules/SSignalKit/SwiftSignalKit/Timer.swift @@ -34,10 +34,10 @@ public final class Timer { if self.`repeat` { let time: DispatchTime = DispatchTime.now() + self.timeout - timer.scheduleRepeating(deadline: time, interval: self.timeout) + timer.schedule(deadline: time, repeating: self.timeout) } else { let time: DispatchTime = DispatchTime.now() + self.timeout - timer.scheduleOneshot(deadline: time) + timer.schedule(deadline: time) } timer.resume() diff --git a/submodules/TelegramApi/TelegramApi copy-Info.plist b/submodules/TelegramApi/TelegramApi copy-Info.plist new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/submodules/TelegramApi/TelegramApi copy-Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/submodules/TelegramApi/TelegramApi copy2-Info.plist b/submodules/TelegramApi/TelegramApi copy2-Info.plist new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/submodules/TelegramApi/TelegramApi copy2-Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/submodules/TelegramApi/TelegramApi_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramApi/TelegramApi_Xcode.xcodeproj/project.pbxproj index f68004fc2d..1f399c776d 100644 --- a/submodules/TelegramApi/TelegramApi_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramApi/TelegramApi_Xcode.xcodeproj/project.pbxproj @@ -18,6 +18,17 @@ D035734722B5C9BF00F0920D /* SecretApiLayer46.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035734422B5C9BF00F0920D /* SecretApiLayer46.swift */; }; D035734822B5C9BF00F0920D /* SecretApiLayer8.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035734522B5C9BF00F0920D /* SecretApiLayer8.swift */; }; D035734922B5C9BF00F0920D /* SecretApiLayer73.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035734622B5C9BF00F0920D /* SecretApiLayer73.swift */; }; + D0CC4AC422BA46F30088F36D /* TelegramApi.h in Headers */ = {isa = PBXBuildFile; fileRef = D035732222B5C1FC00F0920D /* TelegramApi.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D0CC4AC622BA46F30088F36D /* SecretApiLayer46.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035734422B5C9BF00F0920D /* SecretApiLayer46.swift */; }; + D0CC4AC722BA46F30088F36D /* Api1.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733222B5C29900F0920D /* Api1.swift */; }; + D0CC4AC822BA46F30088F36D /* Api0.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733022B5C29900F0920D /* Api0.swift */; }; + D0CC4AC922BA46F30088F36D /* Api3.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733322B5C29900F0920D /* Api3.swift */; }; + D0CC4ACA22BA46F30088F36D /* SecretApiLayer73.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035734622B5C9BF00F0920D /* SecretApiLayer73.swift */; }; + D0CC4ACB22BA46F30088F36D /* TelegramApiLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733A22B5C31400F0920D /* TelegramApiLogger.swift */; }; + D0CC4ACC22BA46F30088F36D /* Buffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733822B5C2E200F0920D /* Buffer.swift */; }; + D0CC4ACD22BA46F30088F36D /* DeserializeFunctionResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733C22B5C39100F0920D /* DeserializeFunctionResponse.swift */; }; + D0CC4ACE22BA46F30088F36D /* SecretApiLayer8.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035734522B5C9BF00F0920D /* SecretApiLayer8.swift */; }; + D0CC4ACF22BA46F30088F36D /* Api2.swift in Sources */ = {isa = PBXBuildFile; fileRef = D035733122B5C29900F0920D /* Api2.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -34,6 +45,9 @@ D035734422B5C9BF00F0920D /* SecretApiLayer46.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretApiLayer46.swift; sourceTree = ""; }; D035734522B5C9BF00F0920D /* SecretApiLayer8.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretApiLayer8.swift; sourceTree = ""; }; D035734622B5C9BF00F0920D /* SecretApiLayer73.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecretApiLayer73.swift; sourceTree = ""; }; + D0CC4AC122BA468D0088F36D /* TelegramApi copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "TelegramApi copy-Info.plist"; path = "/Users/keepcoder/Dropbox/Telegram-multi-acc/submodules/telegram-ios/submodules/TelegramApi/TelegramApi copy-Info.plist"; sourceTree = ""; }; + D0CC4AD922BA46F30088F36D /* TelegramApiMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TelegramApiMac.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0CC4ADA22BA46F40088F36D /* TelegramApi copy2-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "TelegramApi copy2-Info.plist"; path = "/Users/keepcoder/Dropbox/Telegram-multi-acc/submodules/telegram-ios/submodules/TelegramApi/TelegramApi copy2-Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -44,6 +58,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D0CC4AD022BA46F30088F36D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -53,6 +74,8 @@ D035732322B5C1FC00F0920D /* Info.plist */, D035732122B5C1FC00F0920D /* Sources */, D035732022B5C1FC00F0920D /* Products */, + D0CC4AC122BA468D0088F36D /* TelegramApi copy-Info.plist */, + D0CC4ADA22BA46F40088F36D /* TelegramApi copy2-Info.plist */, ); sourceTree = ""; }; @@ -60,6 +83,7 @@ isa = PBXGroup; children = ( D035731F22B5C1FC00F0920D /* TelegramApi.framework */, + D0CC4AD922BA46F30088F36D /* TelegramApiMac.framework */, ); name = Products; sourceTree = ""; @@ -93,6 +117,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D0CC4AC322BA46F30088F36D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + D0CC4AC422BA46F30088F36D /* TelegramApi.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -114,6 +146,24 @@ productReference = D035731F22B5C1FC00F0920D /* TelegramApi.framework */; productType = "com.apple.product-type.framework"; }; + D0CC4AC222BA46F30088F36D /* TelegramApiMac */ = { + isa = PBXNativeTarget; + buildConfigurationList = D0CC4AD222BA46F30088F36D /* Build configuration list for PBXNativeTarget "TelegramApiMac" */; + buildPhases = ( + D0CC4AC322BA46F30088F36D /* Headers */, + D0CC4AC522BA46F30088F36D /* Sources */, + D0CC4AD022BA46F30088F36D /* Frameworks */, + D0CC4AD122BA46F30088F36D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = TelegramApiMac; + productName = TelegramApi; + productReference = D0CC4AD922BA46F30088F36D /* TelegramApiMac.framework */; + productType = "com.apple.product-type.framework"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -143,6 +193,7 @@ projectRoot = ""; targets = ( D035731E22B5C1FC00F0920D /* TelegramApi */, + D0CC4AC222BA46F30088F36D /* TelegramApiMac */, ); }; /* End PBXProject section */ @@ -155,6 +206,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D0CC4AD122BA46F30088F36D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -175,6 +233,23 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D0CC4AC522BA46F30088F36D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D0CC4AC622BA46F30088F36D /* SecretApiLayer46.swift in Sources */, + D0CC4AC722BA46F30088F36D /* Api1.swift in Sources */, + D0CC4AC822BA46F30088F36D /* Api0.swift in Sources */, + D0CC4AC922BA46F30088F36D /* Api3.swift in Sources */, + D0CC4ACA22BA46F30088F36D /* SecretApiLayer73.swift in Sources */, + D0CC4ACB22BA46F30088F36D /* TelegramApiLogger.swift in Sources */, + D0CC4ACC22BA46F30088F36D /* Buffer.swift in Sources */, + D0CC4ACD22BA46F30088F36D /* DeserializeFunctionResponse.swift in Sources */, + D0CC4ACE22BA46F30088F36D /* SecretApiLayer8.swift in Sources */, + D0CC4ACF22BA46F30088F36D /* Api2.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -235,6 +310,7 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; VERSIONING_SYSTEM = "apple-generic"; @@ -292,6 +368,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; @@ -414,6 +491,7 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; VERSIONING_SYSTEM = "apple-generic"; @@ -500,6 +578,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; @@ -536,6 +615,384 @@ }; name = ReleaseAppStoreLLC; }; + D0CC4AA522BA44AD0088F36D /* DebugAppStore */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = DebugAppStore; + }; + D0CC4AA622BA44AD0088F36D /* DebugAppStore */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = DebugAppStore; + }; + D0CC4AA722BA44B70088F36D /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0CC4AA822BA44B70088F36D /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = HockeyappMacAlpha; + }; + D0CC4AD322BA46F30088F36D /* DebugHockeyapp */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "TelegramApi copy2-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = DebugHockeyapp; + }; + D0CC4AD422BA46F30088F36D /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "TelegramApi copy2-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = HockeyappMacAlpha; + }; + D0CC4AD522BA46F30088F36D /* DebugAppStore */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "TelegramApi copy2-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = DebugAppStore; + }; + D0CC4AD622BA46F30088F36D /* DebugAppStoreLLC */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "TelegramApi copy2-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = DebugAppStoreLLC; + }; + D0CC4AD722BA46F30088F36D /* ReleaseHockeyappInternal */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "TelegramApi copy2-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = ReleaseHockeyappInternal; + }; + D0CC4AD822BA46F30088F36D /* ReleaseAppStoreLLC */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "TelegramApi copy2-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramApi; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = ReleaseAppStoreLLC; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -543,6 +1000,8 @@ isa = XCConfigurationList; buildConfigurations = ( D035732522B5C1FC00F0920D /* DebugHockeyapp */, + D0CC4AA722BA44B70088F36D /* HockeyappMacAlpha */, + D0CC4AA522BA44AD0088F36D /* DebugAppStore */, D035732A22B5C23200F0920D /* DebugAppStoreLLC */, D035732622B5C1FC00F0920D /* ReleaseHockeyappInternal */, D035732C22B5C24100F0920D /* ReleaseAppStoreLLC */, @@ -554,6 +1013,8 @@ isa = XCConfigurationList; buildConfigurations = ( D035732822B5C1FC00F0920D /* DebugHockeyapp */, + D0CC4AA822BA44B70088F36D /* HockeyappMacAlpha */, + D0CC4AA622BA44AD0088F36D /* DebugAppStore */, D035732B22B5C23200F0920D /* DebugAppStoreLLC */, D035732922B5C1FC00F0920D /* ReleaseHockeyappInternal */, D035732D22B5C24100F0920D /* ReleaseAppStoreLLC */, @@ -561,6 +1022,19 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = ReleaseHockeyappInternal; }; + D0CC4AD222BA46F30088F36D /* Build configuration list for PBXNativeTarget "TelegramApiMac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D0CC4AD322BA46F30088F36D /* DebugHockeyapp */, + D0CC4AD422BA46F30088F36D /* HockeyappMacAlpha */, + D0CC4AD522BA46F30088F36D /* DebugAppStore */, + D0CC4AD622BA46F30088F36D /* DebugAppStoreLLC */, + D0CC4AD722BA46F30088F36D /* ReleaseHockeyappInternal */, + D0CC4AD822BA46F30088F36D /* ReleaseAppStoreLLC */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = ReleaseHockeyappInternal; + }; /* End XCConfigurationList section */ }; rootObject = D035731622B5C1FC00F0920D /* Project object */; diff --git a/submodules/TelegramCore/TelegramCore/Account.swift b/submodules/TelegramCore/TelegramCore/Account.swift index 539e3d836d..9236492597 100644 --- a/submodules/TelegramCore/TelegramCore/Account.swift +++ b/submodules/TelegramCore/TelegramCore/Account.swift @@ -3,9 +3,11 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else @@ -14,7 +16,7 @@ import Foundation import UIKit #endif import TelegramCorePrivateModule -import TelegramApi + public protocol AccountState: PostboxCoding { func equalsTo(_ other: AccountState) -> Bool diff --git a/submodules/TelegramCore/TelegramCore/AccountIntermediateState.swift b/submodules/TelegramCore/TelegramCore/AccountIntermediateState.swift index 8971dc5e8f..3464682d33 100644 --- a/submodules/TelegramCore/TelegramCore/AccountIntermediateState.swift +++ b/submodules/TelegramCore/TelegramCore/AccountIntermediateState.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi struct PeerChatInfo { var notificationSettings: PeerNotificationSettings diff --git a/submodules/TelegramCore/TelegramCore/AccountManager.swift b/submodules/TelegramCore/TelegramCore/AccountManager.swift index 1fe979549f..2bd1d676a7 100644 --- a/submodules/TelegramCore/TelegramCore/AccountManager.swift +++ b/submodules/TelegramCore/TelegramCore/AccountManager.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private enum AccountKind { case authorized diff --git a/submodules/TelegramCore/TelegramCore/AccountState.swift b/submodules/TelegramCore/TelegramCore/AccountState.swift index 3c12391c6f..337c5a7a6c 100644 --- a/submodules/TelegramCore/TelegramCore/AccountState.swift +++ b/submodules/TelegramCore/TelegramCore/AccountState.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi private enum SentAuthorizationCodeTypeValue: Int32 { case otherSession = 0 diff --git a/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift b/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift index f1cfcf23df..11a193fa6d 100644 --- a/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift +++ b/submodules/TelegramCore/TelegramCore/AccountStateManagementUtils.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private func peerIdsFromUpdateGroups(_ groups: [UpdateGroup]) -> Set { var peerIds = Set() diff --git a/submodules/TelegramCore/TelegramCore/AccountStateManager.swift b/submodules/TelegramCore/TelegramCore/AccountStateManager.swift index 939d0e0fa4..5cfeb74ba9 100644 --- a/submodules/TelegramCore/TelegramCore/AccountStateManager.swift +++ b/submodules/TelegramCore/TelegramCore/AccountStateManager.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private enum AccountStateManagerOperationContent { case pollDifference(AccountFinalStateEvents) diff --git a/submodules/TelegramCore/TelegramCore/AccountStateReset.swift b/submodules/TelegramCore/TelegramCore/AccountStateReset.swift index 4a658481de..dfaf2d39cd 100644 --- a/submodules/TelegramCore/TelegramCore/AccountStateReset.swift +++ b/submodules/TelegramCore/TelegramCore/AccountStateReset.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private struct LocalChatListEntryRange { var entries: [ChatListNamespaceEntry] diff --git a/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift b/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift index da6aff337d..b4b5536482 100644 --- a/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift +++ b/submodules/TelegramCore/TelegramCore/AccountViewTracker.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum CallListViewType { case all diff --git a/submodules/TelegramCore/TelegramCore/AddPeerMember.swift b/submodules/TelegramCore/TelegramCore/AddPeerMember.swift index 4fb4eb950d..ec85e49a13 100644 --- a/submodules/TelegramCore/TelegramCore/AddPeerMember.swift +++ b/submodules/TelegramCore/TelegramCore/AddPeerMember.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum AddGroupMemberError { case generic diff --git a/submodules/TelegramCore/TelegramCore/AddressNames.swift b/submodules/TelegramCore/TelegramCore/AddressNames.swift index 69af6f389f..62f058e211 100644 --- a/submodules/TelegramCore/TelegramCore/AddressNames.swift +++ b/submodules/TelegramCore/TelegramCore/AddressNames.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum AddressNameFormatError { case startsWithUnderscore diff --git a/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift b/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift index e0e4db8f72..0999f89c2f 100644 --- a/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift +++ b/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi func imageRepresentationsForApiChatPhoto(_ photo: Api.ChatPhoto) -> [TelegramMediaImageRepresentation] { var representations: [TelegramMediaImageRepresentation] = [] diff --git a/submodules/TelegramCore/TelegramCore/ApiUtils.swift b/submodules/TelegramCore/TelegramCore/ApiUtils.swift index c425388858..846130ac95 100644 --- a/submodules/TelegramCore/TelegramCore/ApiUtils.swift +++ b/submodules/TelegramCore/TelegramCore/ApiUtils.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum PeerReference: PostboxCoding, Hashable, Equatable { case user(id: Int32, accessHash: Int64) diff --git a/submodules/TelegramCore/TelegramCore/AppChangelog.swift b/submodules/TelegramCore/TelegramCore/AppChangelog.swift index 46b1e71ecb..0b5ca59dee 100644 --- a/submodules/TelegramCore/TelegramCore/AppChangelog.swift +++ b/submodules/TelegramCore/TelegramCore/AppChangelog.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else import Postbox +import TelegramApi import SwiftSignalKit #if BUCK import MtProtoKit @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi func managedAppChangelog(postbox: Postbox, network: Network, stateManager: AccountStateManager, appVersion: String) -> Signal { return stateManager.pollStateUpdateCompletion() diff --git a/submodules/TelegramCore/TelegramCore/ApplyMaxReadIndexInteractively.swift b/submodules/TelegramCore/TelegramCore/ApplyMaxReadIndexInteractively.swift index 4174282ce3..3a13aace67 100644 --- a/submodules/TelegramCore/TelegramCore/ApplyMaxReadIndexInteractively.swift +++ b/submodules/TelegramCore/TelegramCore/ApplyMaxReadIndexInteractively.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func applyMaxReadIndexInteractively(postbox: Postbox, stateManager: AccountStateManager, index: MessageIndex) -> Signal { return postbox.transaction { transaction -> Void in diff --git a/submodules/TelegramCore/TelegramCore/ApplyUpdateMessage.swift b/submodules/TelegramCore/TelegramCore/ApplyUpdateMessage.swift index 60589a0bb7..48bb0cb376 100644 --- a/submodules/TelegramCore/TelegramCore/ApplyUpdateMessage.swift +++ b/submodules/TelegramCore/TelegramCore/ApplyUpdateMessage.swift @@ -2,12 +2,13 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else + import TelegramApi import Postbox import SwiftSignalKit import UIKit #endif -import TelegramApi func applyMediaResourceChanges(from: Media, to: Media, postbox: Postbox) { if let fromImage = from as? TelegramMediaImage, let toImage = to as? TelegramMediaImage { diff --git a/submodules/TelegramCore/TelegramCore/ArchivedStickerPacks.swift b/submodules/TelegramCore/TelegramCore/ArchivedStickerPacks.swift index f04e622cbf..5fa6ab3e84 100644 --- a/submodules/TelegramCore/TelegramCore/ArchivedStickerPacks.swift +++ b/submodules/TelegramCore/TelegramCore/ArchivedStickerPacks.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum ArchivedStickerPacksNamespace: Int32 { case stickers = 0 diff --git a/submodules/TelegramCore/TelegramCore/Authorization.swift b/submodules/TelegramCore/TelegramCore/Authorization.swift index 6e17eca2b7..8f7b39bd21 100644 --- a/submodules/TelegramCore/TelegramCore/Authorization.swift +++ b/submodules/TelegramCore/TelegramCore/Authorization.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum AuthorizationCodeRequestError { case invalidPhoneNumber diff --git a/submodules/TelegramCore/TelegramCore/AutodownloadSettings.swift b/submodules/TelegramCore/TelegramCore/AutodownloadSettings.swift index 428280b3fb..3dc0ae54ff 100644 --- a/submodules/TelegramCore/TelegramCore/AutodownloadSettings.swift +++ b/submodules/TelegramCore/TelegramCore/AutodownloadSettings.swift @@ -2,11 +2,13 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi + public enum AutodownloadPreset { case low diff --git a/submodules/TelegramCore/TelegramCore/BlockedPeers.swift b/submodules/TelegramCore/TelegramCore/BlockedPeers.swift index 8a20f5c618..86e1c89945 100644 --- a/submodules/TelegramCore/TelegramCore/BlockedPeers.swift +++ b/submodules/TelegramCore/TelegramCore/BlockedPeers.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func requestBlockedPeers(account: Account) -> Signal<[Peer], NoError> { return account.network.request(Api.functions.contacts.getBlocked(offset: 0, limit: 100)) diff --git a/submodules/TelegramCore/TelegramCore/BlockedPeersContext.swift b/submodules/TelegramCore/TelegramCore/BlockedPeersContext.swift index 9c1731a7fb..30b417b530 100644 --- a/submodules/TelegramCore/TelegramCore/BlockedPeersContext.swift +++ b/submodules/TelegramCore/TelegramCore/BlockedPeersContext.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi public struct BlockedPeersContextState: Equatable { public var isLoadingMore: Bool diff --git a/submodules/TelegramCore/TelegramCore/BotInfo.swift b/submodules/TelegramCore/TelegramCore/BotInfo.swift index 5f7dbe356a..76e78942bf 100644 --- a/submodules/TelegramCore/TelegramCore/BotInfo.swift +++ b/submodules/TelegramCore/TelegramCore/BotInfo.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct BotCommand: PostboxCoding, Equatable { public let text: String diff --git a/submodules/TelegramCore/TelegramCore/BotPaymentForm.swift b/submodules/TelegramCore/TelegramCore/BotPaymentForm.swift index ba54887f14..c8bb497d45 100644 --- a/submodules/TelegramCore/TelegramCore/BotPaymentForm.swift +++ b/submodules/TelegramCore/TelegramCore/BotPaymentForm.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi public struct BotPaymentInvoiceFields: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/CachedChannelData.swift b/submodules/TelegramCore/TelegramCore/CachedChannelData.swift index 651117d7e2..90f775e22d 100644 --- a/submodules/TelegramCore/TelegramCore/CachedChannelData.swift +++ b/submodules/TelegramCore/TelegramCore/CachedChannelData.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct CachedChannelFlags: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift b/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift index 33e46c6e20..1a1d855829 100644 --- a/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift +++ b/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi private enum ChannelParticipantValue: Int32 { case member = 0 diff --git a/submodules/TelegramCore/TelegramCore/CachedGroupParticipants.swift b/submodules/TelegramCore/TelegramCore/CachedGroupParticipants.swift index 0311d7380e..deef543c4d 100644 --- a/submodules/TelegramCore/TelegramCore/CachedGroupParticipants.swift +++ b/submodules/TelegramCore/TelegramCore/CachedGroupParticipants.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum GroupParticipant: PostboxCoding, Equatable { case member(id: PeerId, invitedBy: PeerId, invitedAt: Int32) diff --git a/submodules/TelegramCore/TelegramCore/CallSessionManager.swift b/submodules/TelegramCore/TelegramCore/CallSessionManager.swift index 014a5c986f..a0e429a821 100644 --- a/submodules/TelegramCore/TelegramCore/CallSessionManager.swift +++ b/submodules/TelegramCore/TelegramCore/CallSessionManager.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox +import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,7 @@ import Postbox #endif import SwiftSignalKit #endif -import TelegramApi + private let minLayer: Int32 = 65 diff --git a/submodules/TelegramCore/TelegramCore/CancelAccountReset.swift b/submodules/TelegramCore/TelegramCore/CancelAccountReset.swift index 5983563e03..b467f434e1 100644 --- a/submodules/TelegramCore/TelegramCore/CancelAccountReset.swift +++ b/submodules/TelegramCore/TelegramCore/CancelAccountReset.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi public struct CancelAccountResetData: Equatable { public let type: SentAuthorizationCodeType diff --git a/submodules/TelegramCore/TelegramCore/ChangeAccountPhoneNumber.swift b/submodules/TelegramCore/TelegramCore/ChangeAccountPhoneNumber.swift index 8a51f23aab..87ae6c73e1 100644 --- a/submodules/TelegramCore/TelegramCore/ChangeAccountPhoneNumber.swift +++ b/submodules/TelegramCore/TelegramCore/ChangeAccountPhoneNumber.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public struct ChangeAccountPhoneNumberData: Equatable { public let type: SentAuthorizationCodeType diff --git a/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift b/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift index 66a84f18b2..82886b9bc2 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelAdminEventLogs.swift @@ -2,16 +2,17 @@ import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public typealias AdminLogEventId = Int64 diff --git a/submodules/TelegramCore/TelegramCore/ChannelAdmins.swift b/submodules/TelegramCore/TelegramCore/ChannelAdmins.swift index 2909341de3..016ad4d7ca 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelAdmins.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelAdmins.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func channelAdmins(account: Account, peerId: PeerId) -> Signal<[RenderedChannelParticipant], NoError> { return account.postbox.transaction { transaction -> Signal<[RenderedChannelParticipant], NoError> in diff --git a/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift b/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift index 019ccdd928..9a7ec28554 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private enum ChannelBlacklistFilter { case restricted diff --git a/submodules/TelegramCore/TelegramCore/ChannelCreation.swift b/submodules/TelegramCore/TelegramCore/ChannelCreation.swift index 3bab0cd331..46e9d81189 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelCreation.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelCreation.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum CreateChannelError { case generic diff --git a/submodules/TelegramCore/TelegramCore/ChannelHistoryAvailabilitySettings.swift b/submodules/TelegramCore/TelegramCore/ChannelHistoryAvailabilitySettings.swift index fba6894dab..c57bf215f3 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelHistoryAvailabilitySettings.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelHistoryAvailabilitySettings.swift @@ -1,11 +1,12 @@ #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum ChannelHistoryAvailabilityError { case generic diff --git a/submodules/TelegramCore/TelegramCore/ChannelMembers.swift b/submodules/TelegramCore/TelegramCore/ChannelMembers.swift index aeee58563d..858abfb1ba 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelMembers.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelMembers.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum ChannelMembersCategoryFilter { case all diff --git a/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift b/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift index ea33aa52e8..5b2b628561 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift @@ -2,11 +2,13 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif + public enum ChannelOwnershipTransferError { case generic diff --git a/submodules/TelegramCore/TelegramCore/ChannelParticipants.swift b/submodules/TelegramCore/TelegramCore/ChannelParticipants.swift index 44e3078d28..f82a167beb 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelParticipants.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelParticipants.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public struct RenderedChannelParticipant: Equatable { public let participant: ChannelParticipant diff --git a/submodules/TelegramCore/TelegramCore/ChannelState.swift b/submodules/TelegramCore/TelegramCore/ChannelState.swift index 679918a738..1bcbc39a2d 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelState.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelState.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi final class ChannelState: PeerChatState, Equatable, CustomStringConvertible { let pts: Int32 diff --git a/submodules/TelegramCore/TelegramCore/ChannelStats.swift b/submodules/TelegramCore/TelegramCore/ChannelStats.swift index 8c2fe09f93..8b04dc2051 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelStats.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelStats.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif public enum ChannelStatsUrlError { case generic diff --git a/submodules/TelegramCore/TelegramCore/ChatContextResult.swift b/submodules/TelegramCore/TelegramCore/ChatContextResult.swift index 4628457fb6..a97cae03b7 100644 --- a/submodules/TelegramCore/TelegramCore/ChatContextResult.swift +++ b/submodules/TelegramCore/TelegramCore/ChatContextResult.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum ChatContextResultMessage: PostboxCoding, Equatable { case auto(caption: String, entities: TextEntitiesMessageAttribute?, replyMarkup: ReplyMarkupMessageAttribute?) diff --git a/submodules/TelegramCore/TelegramCore/ChatOnlineMembers.swift b/submodules/TelegramCore/TelegramCore/ChatOnlineMembers.swift index a5a946b6dd..1689e5d350 100644 --- a/submodules/TelegramCore/TelegramCore/ChatOnlineMembers.swift +++ b/submodules/TelegramCore/TelegramCore/ChatOnlineMembers.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif public func chatOnlineMembers(postbox: Postbox, network: Network, peerId: PeerId) -> Signal { return postbox.transaction { transaction -> Api.InputPeer? in diff --git a/submodules/TelegramCore/TelegramCore/ClearCloudDrafts.swift b/submodules/TelegramCore/TelegramCore/ClearCloudDrafts.swift index 6d72e2af9f..39f37487fd 100644 --- a/submodules/TelegramCore/TelegramCore/ClearCloudDrafts.swift +++ b/submodules/TelegramCore/TelegramCore/ClearCloudDrafts.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi +#endif public func clearCloudDraftsInteractively(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal { return network.request(Api.functions.messages.getAllDrafts()) diff --git a/submodules/TelegramCore/TelegramCore/CloudFileMediaResource.swift b/submodules/TelegramCore/TelegramCore/CloudFileMediaResource.swift index 065c0a49cd..36883a5a57 100644 --- a/submodules/TelegramCore/TelegramCore/CloudFileMediaResource.swift +++ b/submodules/TelegramCore/TelegramCore/CloudFileMediaResource.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi protocol TelegramCloudMediaResource: TelegramMediaResource { func apiInputLocation(fileReference: Data?) -> Api.InputFileLocation? diff --git a/submodules/TelegramCore/TelegramCore/ConfirmTwoStepRecoveryEmail.swift b/submodules/TelegramCore/TelegramCore/ConfirmTwoStepRecoveryEmail.swift index 96093961a1..b41c81ed52 100644 --- a/submodules/TelegramCore/TelegramCore/ConfirmTwoStepRecoveryEmail.swift +++ b/submodules/TelegramCore/TelegramCore/ConfirmTwoStepRecoveryEmail.swift @@ -2,15 +2,17 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else import SwiftSignalKit +import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi + public enum ConfirmTwoStepRecoveryEmailError { case invalidEmail diff --git a/submodules/TelegramCore/TelegramCore/ContactManagement.swift b/submodules/TelegramCore/TelegramCore/ContactManagement.swift index f578f7f67b..8c3b084046 100644 --- a/submodules/TelegramCore/TelegramCore/ContactManagement.swift +++ b/submodules/TelegramCore/TelegramCore/ContactManagement.swift @@ -2,12 +2,13 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else + import TelegramApi import Postbox import SwiftSignalKit #endif import TelegramCorePrivateModule -import TelegramApi private func md5(_ data: Data) -> Data { return data.withUnsafeBytes { bytes -> Data in diff --git a/submodules/TelegramCore/TelegramCore/ContactSyncManager.swift b/submodules/TelegramCore/TelegramCore/ContactSyncManager.swift index 2e67b17de3..c6375e3b8f 100644 --- a/submodules/TelegramCore/TelegramCore/ContactSyncManager.swift +++ b/submodules/TelegramCore/TelegramCore/ContactSyncManager.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi +#endif private final class ContactSyncOperation { let id: Int32 diff --git a/submodules/TelegramCore/TelegramCore/ConvertGroupToSupergroup.swift b/submodules/TelegramCore/TelegramCore/ConvertGroupToSupergroup.swift index 66c272b5ce..3368c652c1 100644 --- a/submodules/TelegramCore/TelegramCore/ConvertGroupToSupergroup.swift +++ b/submodules/TelegramCore/TelegramCore/ConvertGroupToSupergroup.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum ConvertGroupToSupergroupError { case generic diff --git a/submodules/TelegramCore/TelegramCore/CreateGroup.swift b/submodules/TelegramCore/TelegramCore/CreateGroup.swift index 55e69610d5..6a2bc5d015 100644 --- a/submodules/TelegramCore/TelegramCore/CreateGroup.swift +++ b/submodules/TelegramCore/TelegramCore/CreateGroup.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum CreateGroupError { case generic diff --git a/submodules/TelegramCore/TelegramCore/CreateSecretChat.swift b/submodules/TelegramCore/TelegramCore/CreateSecretChat.swift index f2f3edbb15..4bfbcf34f6 100644 --- a/submodules/TelegramCore/TelegramCore/CreateSecretChat.swift +++ b/submodules/TelegramCore/TelegramCore/CreateSecretChat.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum CreateSecretChatError { case generic diff --git a/submodules/TelegramCore/TelegramCore/DeepLinkInfo.swift b/submodules/TelegramCore/TelegramCore/DeepLinkInfo.swift index 47b56155ae..dcf8c4d829 100644 --- a/submodules/TelegramCore/TelegramCore/DeepLinkInfo.swift +++ b/submodules/TelegramCore/TelegramCore/DeepLinkInfo.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import SwiftSignalKitMac +import TelegramApiMac #else import SwiftSignalKit -#endif import TelegramApi +#endif public struct DeepLinkInfo { public let message: String diff --git a/submodules/TelegramCore/TelegramCore/DeleteAccount.swift b/submodules/TelegramCore/TelegramCore/DeleteAccount.swift index f147d71bb9..336862467f 100644 --- a/submodules/TelegramCore/TelegramCore/DeleteAccount.swift +++ b/submodules/TelegramCore/TelegramCore/DeleteAccount.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif public enum DeleteAccountError { case generic diff --git a/submodules/TelegramCore/TelegramCore/DeleteMessagesInteractively.swift b/submodules/TelegramCore/TelegramCore/DeleteMessagesInteractively.swift index 94f06115b2..656e883e7c 100644 --- a/submodules/TelegramCore/TelegramCore/DeleteMessagesInteractively.swift +++ b/submodules/TelegramCore/TelegramCore/DeleteMessagesInteractively.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum InteractiveMessagesDeletionType: Int32 { case forLocalPeer = 0 diff --git a/submodules/TelegramCore/TelegramCore/Download.swift b/submodules/TelegramCore/TelegramCore/Download.swift index 51763aafb8..9b1f814f11 100644 --- a/submodules/TelegramCore/TelegramCore/Download.swift +++ b/submodules/TelegramCore/TelegramCore/Download.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi private func roundUp(_ value: Int, to multiple: Int) -> Int { if multiple == 0 { diff --git a/submodules/TelegramCore/TelegramCore/EnqueueMessage.swift b/submodules/TelegramCore/TelegramCore/EnqueueMessage.swift index 01ba73b5df..f1725a95b1 100644 --- a/submodules/TelegramCore/TelegramCore/EnqueueMessage.swift +++ b/submodules/TelegramCore/TelegramCore/EnqueueMessage.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum EnqueueMessageGrouping { case none diff --git a/submodules/TelegramCore/TelegramCore/ExportMessageLink.swift b/submodules/TelegramCore/TelegramCore/ExportMessageLink.swift index de69744fae..ce3d309dec 100644 --- a/submodules/TelegramCore/TelegramCore/ExportMessageLink.swift +++ b/submodules/TelegramCore/TelegramCore/ExportMessageLink.swift @@ -2,11 +2,12 @@ #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func exportMessageLink(account: Account, peerId: PeerId, messageId: MessageId) -> Signal { return account.postbox.transaction { transaction -> Peer? in diff --git a/submodules/TelegramCore/TelegramCore/ExportedInvitation.swift b/submodules/TelegramCore/TelegramCore/ExportedInvitation.swift index 6fb50b3dca..972ce71639 100644 --- a/submodules/TelegramCore/TelegramCore/ExportedInvitation.swift +++ b/submodules/TelegramCore/TelegramCore/ExportedInvitation.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct ExportedInvitation: PostboxCoding, Equatable { public let link: String diff --git a/submodules/TelegramCore/TelegramCore/FetchChatList.swift b/submodules/TelegramCore/TelegramCore/FetchChatList.swift index cfb264c454..303e6bc334 100644 --- a/submodules/TelegramCore/TelegramCore/FetchChatList.swift +++ b/submodules/TelegramCore/TelegramCore/FetchChatList.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi enum FetchChatListLocation { case general diff --git a/submodules/TelegramCore/TelegramCore/FindChannelById.swift b/submodules/TelegramCore/TelegramCore/FindChannelById.swift index 8f3b9010c7..e0b7d0fadf 100644 --- a/submodules/TelegramCore/TelegramCore/FindChannelById.swift +++ b/submodules/TelegramCore/TelegramCore/FindChannelById.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif public func findChannelById(postbox: Postbox, network: Network, channelId: Int32) -> Signal { return network.request(Api.functions.channels.getChannels(id: [.inputChannel(channelId: channelId, accessHash: 0)])) diff --git a/submodules/TelegramCore/TelegramCore/ForwardGame.swift b/submodules/TelegramCore/TelegramCore/ForwardGame.swift index 8371feb219..d782cc890e 100644 --- a/submodules/TelegramCore/TelegramCore/ForwardGame.swift +++ b/submodules/TelegramCore/TelegramCore/ForwardGame.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func forwardGameWithScore(account: Account, messageId: MessageId, to peerId: PeerId) -> Signal { return account.postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/GlobalNotificationSettings.swift b/submodules/TelegramCore/TelegramCore/GlobalNotificationSettings.swift index 0e18bdf5c4..06320fcb29 100644 --- a/submodules/TelegramCore/TelegramCore/GlobalNotificationSettings.swift +++ b/submodules/TelegramCore/TelegramCore/GlobalNotificationSettings.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct MessageNotificationSettings: PostboxCoding, Equatable { public var enabled: Bool diff --git a/submodules/TelegramCore/TelegramCore/GrantSecureIdAccess.swift b/submodules/TelegramCore/TelegramCore/GrantSecureIdAccess.swift index bf5e05a521..6058e3e96a 100644 --- a/submodules/TelegramCore/TelegramCore/GrantSecureIdAccess.swift +++ b/submodules/TelegramCore/TelegramCore/GrantSecureIdAccess.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi func apiSecureValueType(value: SecureIdValue) -> Api.SecureValueType { let type: Api.SecureValueType diff --git a/submodules/TelegramCore/TelegramCore/GroupReturnAndLeft.swift b/submodules/TelegramCore/TelegramCore/GroupReturnAndLeft.swift index b271f72da5..6606d85d5a 100644 --- a/submodules/TelegramCore/TelegramCore/GroupReturnAndLeft.swift +++ b/submodules/TelegramCore/TelegramCore/GroupReturnAndLeft.swift @@ -3,16 +3,17 @@ import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func returnGroup(account: Account, peerId: PeerId) -> Signal { return account.postbox.loadedPeerWithId(account.peerId) diff --git a/submodules/TelegramCore/TelegramCore/GroupsInCommon.swift b/submodules/TelegramCore/TelegramCore/GroupsInCommon.swift index 89f9ab39a5..64a91fe6dc 100644 --- a/submodules/TelegramCore/TelegramCore/GroupsInCommon.swift +++ b/submodules/TelegramCore/TelegramCore/GroupsInCommon.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func groupsInCommon(account:Account, peerId:PeerId) -> Signal<[PeerId], NoError> { return account.postbox.transaction { transaction -> Signal<[PeerId], NoError> in diff --git a/submodules/TelegramCore/TelegramCore/HistoryViewChannelStateValidation.swift b/submodules/TelegramCore/TelegramCore/HistoryViewChannelStateValidation.swift index a90221ca6c..02ac52a32e 100644 --- a/submodules/TelegramCore/TelegramCore/HistoryViewChannelStateValidation.swift +++ b/submodules/TelegramCore/TelegramCore/HistoryViewChannelStateValidation.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class HistoryStateValidationBatch { private let disposable: Disposable diff --git a/submodules/TelegramCore/TelegramCore/Holes.swift b/submodules/TelegramCore/TelegramCore/Holes.swift index 4b9bdfacd3..1b7511e425 100644 --- a/submodules/TelegramCore/TelegramCore/Holes.swift +++ b/submodules/TelegramCore/TelegramCore/Holes.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private func messageFilterForTagMask(_ tagMask: MessageTags) -> Api.MessagesFilter? { if tagMask == .photoOrVideo { diff --git a/submodules/TelegramCore/TelegramCore/ImageRepresentationsUtils.swift b/submodules/TelegramCore/TelegramCore/ImageRepresentationsUtils.swift index 4d178dd209..15729290e9 100644 --- a/submodules/TelegramCore/TelegramCore/ImageRepresentationsUtils.swift +++ b/submodules/TelegramCore/TelegramCore/ImageRepresentationsUtils.swift @@ -1,10 +1,11 @@ #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi public func smallestImageRepresentation(_ representations: [TelegramMediaImageRepresentation]) -> TelegramMediaImageRepresentation? { if representations.count == 0 { diff --git a/submodules/TelegramCore/TelegramCore/ImportContact.swift b/submodules/TelegramCore/TelegramCore/ImportContact.swift index bdec735be5..8c948bb78a 100644 --- a/submodules/TelegramCore/TelegramCore/ImportContact.swift +++ b/submodules/TelegramCore/TelegramCore/ImportContact.swift @@ -1,11 +1,12 @@ #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func importContact(account: Account, firstName: String, lastName: String, phoneNumber: String) -> Signal { diff --git a/submodules/TelegramCore/TelegramCore/InstallInteractiveReadMessagesAction.swift b/submodules/TelegramCore/TelegramCore/InstallInteractiveReadMessagesAction.swift index 063a45a92a..564aad69bb 100644 --- a/submodules/TelegramCore/TelegramCore/InstallInteractiveReadMessagesAction.swift +++ b/submodules/TelegramCore/TelegramCore/InstallInteractiveReadMessagesAction.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func installInteractiveReadMessagesAction(postbox: Postbox, stateManager: AccountStateManager, peerId: PeerId) -> Disposable { return postbox.installStoreMessageAction(peerId: peerId, { messages, transaction in diff --git a/submodules/TelegramCore/TelegramCore/InstantPage.swift b/submodules/TelegramCore/TelegramCore/InstantPage.swift index 8f0c8f4428..360a7962d3 100644 --- a/submodules/TelegramCore/TelegramCore/InstantPage.swift +++ b/submodules/TelegramCore/TelegramCore/InstantPage.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi private enum InstantPageBlockType: Int32 { case unsupported = 0 diff --git a/submodules/TelegramCore/TelegramCore/InvitationLinks.swift b/submodules/TelegramCore/TelegramCore/InvitationLinks.swift index d9ad5a49bd..8f35202636 100644 --- a/submodules/TelegramCore/TelegramCore/InvitationLinks.swift +++ b/submodules/TelegramCore/TelegramCore/InvitationLinks.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func ensuredExistingPeerExportedInvitation(account: Account, peerId: PeerId, revokeExisted: Bool = false) -> Signal { return account.postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/JSON.swift b/submodules/TelegramCore/TelegramCore/JSON.swift index 6c2c3e9820..07f8ba6638 100644 --- a/submodules/TelegramCore/TelegramCore/JSON.swift +++ b/submodules/TelegramCore/TelegramCore/JSON.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac +import TelegramApiMac #else import Postbox -#endif import TelegramApi +#endif public indirect enum JSON: PostboxCoding, Equatable { case null diff --git a/submodules/TelegramCore/TelegramCore/JoinChannel.swift b/submodules/TelegramCore/TelegramCore/JoinChannel.swift index 35034068e9..00c7d3770b 100644 --- a/submodules/TelegramCore/TelegramCore/JoinChannel.swift +++ b/submodules/TelegramCore/TelegramCore/JoinChannel.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum JoinChannelError { case generic diff --git a/submodules/TelegramCore/TelegramCore/JoinLink.swift b/submodules/TelegramCore/TelegramCore/JoinLink.swift index 5907cf9ff0..b204bb6da5 100644 --- a/submodules/TelegramCore/TelegramCore/JoinLink.swift +++ b/submodules/TelegramCore/TelegramCore/JoinLink.swift @@ -2,16 +2,17 @@ import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi func apiUpdatesGroups(_ updates: Api.Updates) -> [Api.Chat] { switch updates { diff --git a/submodules/TelegramCore/TelegramCore/LoadMessagesIfNecessary.swift b/submodules/TelegramCore/TelegramCore/LoadMessagesIfNecessary.swift index 5f7a030c36..1d545a67e8 100644 --- a/submodules/TelegramCore/TelegramCore/LoadMessagesIfNecessary.swift +++ b/submodules/TelegramCore/TelegramCore/LoadMessagesIfNecessary.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum GetMessagesStrategy { case local diff --git a/submodules/TelegramCore/TelegramCore/LoadedPeer.swift b/submodules/TelegramCore/TelegramCore/LoadedPeer.swift index c82fdc3ffe..81eda2ea5c 100644 --- a/submodules/TelegramCore/TelegramCore/LoadedPeer.swift +++ b/submodules/TelegramCore/TelegramCore/LoadedPeer.swift @@ -1,11 +1,12 @@ #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func actualizedPeer(postbox: Postbox, network: Network, peer: Peer) -> Signal { return postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/LoadedPeerFromMessage.swift b/submodules/TelegramCore/TelegramCore/LoadedPeerFromMessage.swift index fe45b47b32..a15637b8ce 100644 --- a/submodules/TelegramCore/TelegramCore/LoadedPeerFromMessage.swift +++ b/submodules/TelegramCore/TelegramCore/LoadedPeerFromMessage.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func loadedPeerFromMessage(account: Account, peerId: PeerId, messageId: MessageId) -> Signal { return account.postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/LoadedStickerPack.swift b/submodules/TelegramCore/TelegramCore/LoadedStickerPack.swift index b559ec2b41..a2c7843238 100644 --- a/submodules/TelegramCore/TelegramCore/LoadedStickerPack.swift +++ b/submodules/TelegramCore/TelegramCore/LoadedStickerPack.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi extension StickerPackReference { init(_ stickerPackInfo: StickerPackCollectionInfo) { diff --git a/submodules/TelegramCore/TelegramCore/LocalizationInfo.swift b/submodules/TelegramCore/TelegramCore/LocalizationInfo.swift index 8d39fb3107..a364fae4bb 100644 --- a/submodules/TelegramCore/TelegramCore/LocalizationInfo.swift +++ b/submodules/TelegramCore/TelegramCore/LocalizationInfo.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct LocalizationInfo: PostboxCoding, Equatable { public let languageCode: String diff --git a/submodules/TelegramCore/TelegramCore/LocalizationListState.swift b/submodules/TelegramCore/TelegramCore/LocalizationListState.swift index 459c069093..8bc1e1df18 100644 --- a/submodules/TelegramCore/TelegramCore/LocalizationListState.swift +++ b/submodules/TelegramCore/TelegramCore/LocalizationListState.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi +#endif public struct LocalizationListState: PreferencesEntry, Equatable { public var availableOfficialLocalizations: [LocalizationInfo] diff --git a/submodules/TelegramCore/TelegramCore/LocalizationPreview.swift b/submodules/TelegramCore/TelegramCore/LocalizationPreview.swift index 0bb89ca3d2..530abe7cea 100644 --- a/submodules/TelegramCore/TelegramCore/LocalizationPreview.swift +++ b/submodules/TelegramCore/TelegramCore/LocalizationPreview.swift @@ -2,7 +2,9 @@ import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -11,7 +13,7 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi + public enum RequestLocalizationPreviewError { case generic diff --git a/submodules/TelegramCore/TelegramCore/Localizations.swift b/submodules/TelegramCore/TelegramCore/Localizations.swift index 473d1931d9..b103075aab 100644 --- a/submodules/TelegramCore/TelegramCore/Localizations.swift +++ b/submodules/TelegramCore/TelegramCore/Localizations.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func currentlySuggestedLocalization(network: Network, extractKeys: [String]) -> Signal { return network.request(Api.functions.help.getConfig()) diff --git a/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift b/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift index f2afeeedf2..495405972f 100644 --- a/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift +++ b/submodules/TelegramCore/TelegramCore/ManageChannelDiscussionGroup.swift @@ -2,11 +2,13 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif + public enum AvailableChannelDiscussionGroupError { case generic diff --git a/submodules/TelegramCore/TelegramCore/ManagedAccountPresence.swift b/submodules/TelegramCore/TelegramCore/ManagedAccountPresence.swift index 8dabf1d713..c81fe98124 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedAccountPresence.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedAccountPresence.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi #if os(macOS) private typealias SignalKitTimer = SwiftSignalKitMac.Timer diff --git a/submodules/TelegramCore/TelegramCore/ManagedAppConfigurationUpdates.swift b/submodules/TelegramCore/TelegramCore/ManagedAppConfigurationUpdates.swift index 85168e7a33..4b364abcf7 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedAppConfigurationUpdates.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedAppConfigurationUpdates.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi func managedAppConfigurationUpdates(postbox: Postbox, network: Network) -> Signal { let poll = Signal { subscriber in diff --git a/submodules/TelegramCore/TelegramCore/ManagedAutodownloadSettingsUpdates.swift b/submodules/TelegramCore/TelegramCore/ManagedAutodownloadSettingsUpdates.swift index ee14447c3a..8bfdb7ea78 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedAutodownloadSettingsUpdates.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedAutodownloadSettingsUpdates.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi func managedAutodownloadSettingsUpdates(accountManager: AccountManager, network: Network) -> Signal { let poll = Signal { subscriber in diff --git a/submodules/TelegramCore/TelegramCore/ManagedAutoremoveMessageOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedAutoremoveMessageOperations.swift index b96bc16b7b..2f4532fc1d 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedAutoremoveMessageOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedAutoremoveMessageOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi #if os(macOS) private typealias SignalKitTimer = SwiftSignalKitMac.Timer diff --git a/submodules/TelegramCore/TelegramCore/ManagedCloudChatRemoveMessagesOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedCloudChatRemoveMessagesOperations.swift index a36890ed04..1ea8492b16 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedCloudChatRemoveMessagesOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedCloudChatRemoveMessagesOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedCloudChatRemoveMessagesOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedConfigurationUpdates.swift b/submodules/TelegramCore/TelegramCore/ManagedConfigurationUpdates.swift index 5babd0a03c..3b24e17550 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedConfigurationUpdates.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedConfigurationUpdates.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi func managedConfigurationUpdates(accountManager: AccountManager, postbox: Postbox, network: Network) -> Signal { let poll = Signal { subscriber in diff --git a/submodules/TelegramCore/TelegramCore/ManagedConsumePersonalMessagesActions.swift b/submodules/TelegramCore/TelegramCore/ManagedConsumePersonalMessagesActions.swift index 144a5a543d..ffff3c965e 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedConsumePersonalMessagesActions.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedConsumePersonalMessagesActions.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedConsumePersonalMessagesActionsHelper { var operationDisposables: [MessageId: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedGlobalNotificationSettings.swift b/submodules/TelegramCore/TelegramCore/ManagedGlobalNotificationSettings.swift index b00e7c39c2..0557fc2705 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedGlobalNotificationSettings.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedGlobalNotificationSettings.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func updateGlobalNotificationSettingsInteractively(postbox: Postbox, _ f: @escaping (GlobalNotificationSettingsSet) -> GlobalNotificationSettingsSet) -> Signal { return postbox.transaction { transaction -> Void in diff --git a/submodules/TelegramCore/TelegramCore/ManagedLocalInputActivities.swift b/submodules/TelegramCore/TelegramCore/ManagedLocalInputActivities.swift index ca568d3754..17518968b6 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedLocalInputActivities.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedLocalInputActivities.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi struct PeerInputActivityRecord: Equatable { let activity: PeerInputActivity diff --git a/submodules/TelegramCore/TelegramCore/ManagedLocalizationUpdatesOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedLocalizationUpdatesOperations.swift index c92b853b9e..3aa1779f4d 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedLocalizationUpdatesOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedLocalizationUpdatesOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedLocalizationUpdatesOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedPendingPeerNotificationSettings.swift b/submodules/TelegramCore/TelegramCore/ManagedPendingPeerNotificationSettings.swift index b90b018cc5..b9d9149333 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedPendingPeerNotificationSettings.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedPendingPeerNotificationSettings.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedPendingPeerNotificationSettingsHelper { var operationDisposables: [PeerId: (PeerNotificationSettings, Disposable)] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedProxyInfoUpdates.swift b/submodules/TelegramCore/TelegramCore/ManagedProxyInfoUpdates.swift index 7e11ec9623..34a57147e1 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedProxyInfoUpdates.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedProxyInfoUpdates.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi func managedProxyInfoUpdates(postbox: Postbox, network: Network, viewTracker: AccountViewTracker) -> Signal { return Signal { subscriber in diff --git a/submodules/TelegramCore/TelegramCore/ManagedRecentStickers.swift b/submodules/TelegramCore/TelegramCore/ManagedRecentStickers.swift index 98fdfc066a..ad984252ce 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedRecentStickers.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedRecentStickers.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi private func hashForIds(_ ids: [Int64]) -> Int32 { var acc: UInt32 = 0 diff --git a/submodules/TelegramCore/TelegramCore/ManagedSecretChatOutgoingOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSecretChatOutgoingOperations.swift index ca26cf40a4..d716a24340 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSecretChatOutgoingOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSecretChatOutgoingOperations.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #if BUCK import MtProtoKit @@ -13,7 +15,7 @@ import Foundation #endif import UIKit #endif -import TelegramApi + func addSecretChatOutgoingOperation(transaction: Transaction, peerId: PeerId, operation: SecretChatOutgoingOperationContents, state: SecretChatState) -> SecretChatState { var updatedState = state diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeAppLogEventsOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeAppLogEventsOperations.swift index 6da117578c..24c939ee30 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeAppLogEventsOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeAppLogEventsOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeAppLogEventsOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeChatInputStateOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeChatInputStateOperations.swift index cf0e25da15..d534b46a48 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeChatInputStateOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeChatInputStateOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeChatInputStateOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeConsumeMessageContentsOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeConsumeMessageContentsOperations.swift index 2c8e758432..c8ace296c4 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeConsumeMessageContentsOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeConsumeMessageContentsOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeConsumeMessageContentsOperationHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeEmojiKeywordsOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeEmojiKeywordsOperations.swift index 74385c8703..4773e2d9c7 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeEmojiKeywordsOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeEmojiKeywordsOperations.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeEmojiKeywordsOperationHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupMessageStats.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupMessageStats.swift index 8635e31eed..ea8f584d71 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupMessageStats.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupMessageStats.swift @@ -2,12 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi - +#endif private final class ManagedSynchronizeGroupMessageStatsState { private var synchronizeDisposables: [PeerGroupAndNamespace: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupedPeersOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupedPeersOperations.swift index 27f8c23125..872d537fb3 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupedPeersOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeGroupedPeersOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeGroupedPeersOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeInstalledStickerPacksOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeInstalledStickerPacksOperations.swift index fb79793791..977a558c14 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeInstalledStickerPacksOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeInstalledStickerPacksOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeInstalledStickerPacksOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift index b7da6d6680..239f132567 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeMarkAllUnseenPersonalMessagesOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift index 0e9f75f518..35f3e823de 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizePinnedChatsOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizePinnedChatsOperations.swift index 9e21c061f9..50edb4ccf5 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizePinnedChatsOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizePinnedChatsOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizePinnedChatsOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift index bf252a1972..e932a72cb1 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeRecentlyUsedMediaOperations.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeRecentlyUsedMediaOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift index 14d7967c29..6ea80a781b 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedGifsOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeSavedGifsOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift index 00deb7a3b1..034801dda7 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedSynchronizeSavedStickersOperations.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi private final class ManagedSynchronizeSavedStickersOperationsHelper { var operationDisposables: [Int32: Disposable] = [:] diff --git a/submodules/TelegramCore/TelegramCore/ManagedVoipConfigurationUpdates.swift b/submodules/TelegramCore/TelegramCore/ManagedVoipConfigurationUpdates.swift index 5983171679..0852dd7544 100644 --- a/submodules/TelegramCore/TelegramCore/ManagedVoipConfigurationUpdates.swift +++ b/submodules/TelegramCore/TelegramCore/ManagedVoipConfigurationUpdates.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi func managedVoipConfigurationUpdates(postbox: Postbox, network: Network) -> Signal { let poll = Signal { subscriber in diff --git a/submodules/TelegramCore/TelegramCore/MarkAllChatsAsRead.swift b/submodules/TelegramCore/TelegramCore/MarkAllChatsAsRead.swift index 4571bc5a96..6607d16c28 100644 --- a/submodules/TelegramCore/TelegramCore/MarkAllChatsAsRead.swift +++ b/submodules/TelegramCore/TelegramCore/MarkAllChatsAsRead.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi public func markAllChatsAsRead(postbox: Postbox, network: Network, stateManager: AccountStateManager) -> Signal { return network.request(Api.functions.messages.getDialogUnreadMarks()) diff --git a/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift b/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift index dc7cabda69..51c91c09a4 100644 --- a/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift +++ b/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageId: MessageId) -> Signal { return postbox.transaction { transaction -> Void in diff --git a/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift b/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift index b7a9036f2c..4ca56f7bd2 100644 --- a/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift +++ b/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift @@ -1,10 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi + public extension MemoryBuffer { public convenience init(_ buffer: Buffer) { diff --git a/submodules/TelegramCore/TelegramCore/MultipartFetch.swift b/submodules/TelegramCore/TelegramCore/MultipartFetch.swift index f64e7a8e57..b09ae7d48b 100644 --- a/submodules/TelegramCore/TelegramCore/MultipartFetch.swift +++ b/submodules/TelegramCore/TelegramCore/MultipartFetch.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi #if os(macOS) private typealias SignalKitTimer = SwiftSignalKitMac.Timer diff --git a/submodules/TelegramCore/TelegramCore/MultipartUpload.swift b/submodules/TelegramCore/TelegramCore/MultipartUpload.swift index 062adb247d..d402a559ff 100644 --- a/submodules/TelegramCore/TelegramCore/MultipartUpload.swift +++ b/submodules/TelegramCore/TelegramCore/MultipartUpload.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #if BUCK import MtProtoKit @@ -13,7 +15,6 @@ import Foundation #endif #endif import TelegramCorePrivateModule -import TelegramApi #if os(macOS) private typealias SignalKitTimer = SwiftSignalKitMac.Timer diff --git a/submodules/TelegramCore/TelegramCore/MultiplexedRequestManager.swift b/submodules/TelegramCore/TelegramCore/MultiplexedRequestManager.swift index 8216857b1b..8917d87150 100644 --- a/submodules/TelegramCore/TelegramCore/MultiplexedRequestManager.swift +++ b/submodules/TelegramCore/TelegramCore/MultiplexedRequestManager.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi enum MultiplexedRequestTarget: Equatable, Hashable { case main(Int) diff --git a/submodules/TelegramCore/TelegramCore/Network.swift b/submodules/TelegramCore/TelegramCore/Network.swift index 1cb1347221..8a4add6033 100644 --- a/submodules/TelegramCore/TelegramCore/Network.swift +++ b/submodules/TelegramCore/TelegramCore/Network.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #if BUCK import MtProtoKit @@ -13,7 +15,6 @@ import Foundation #endif #endif import TelegramCorePrivateModule -import TelegramApi public enum ConnectionStatus: Equatable { case waitingForNetwork diff --git a/submodules/TelegramCore/TelegramCore/NotificationAutolockReportManager.swift b/submodules/TelegramCore/TelegramCore/NotificationAutolockReportManager.swift index e0ef5ecf03..13dd8da607 100644 --- a/submodules/TelegramCore/TelegramCore/NotificationAutolockReportManager.swift +++ b/submodules/TelegramCore/TelegramCore/NotificationAutolockReportManager.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi #if os(macOS) private typealias SignalKitTimer = SwiftSignalKitMac.Timer diff --git a/submodules/TelegramCore/TelegramCore/NotificationExceptionsList.swift b/submodules/TelegramCore/TelegramCore/NotificationExceptionsList.swift index 904139655e..bbb301cc3c 100644 --- a/submodules/TelegramCore/TelegramCore/NotificationExceptionsList.swift +++ b/submodules/TelegramCore/TelegramCore/NotificationExceptionsList.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif public final class NotificationExceptionsList: Equatable { public let peers: [PeerId: Peer] diff --git a/submodules/TelegramCore/TelegramCore/PeerAdmins.swift b/submodules/TelegramCore/TelegramCore/PeerAdmins.swift index e1318d3455..3f39830d68 100644 --- a/submodules/TelegramCore/TelegramCore/PeerAdmins.swift +++ b/submodules/TelegramCore/TelegramCore/PeerAdmins.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum GroupManagementType { case restrictedToAdmins diff --git a/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift b/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift index 7bbd9ff261..b19c391f17 100644 --- a/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift +++ b/submodules/TelegramCore/TelegramCore/PeerContactSettings.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct PeerStatusSettings: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/PeerInputActivity.swift b/submodules/TelegramCore/TelegramCore/PeerInputActivity.swift index a7ab25a7bd..350d2c4f93 100644 --- a/submodules/TelegramCore/TelegramCore/PeerInputActivity.swift +++ b/submodules/TelegramCore/TelegramCore/PeerInputActivity.swift @@ -1,5 +1,9 @@ import Foundation +#if os(macOS) +import TelegramApiMac +#else import TelegramApi +#endif public enum PeerInputActivity: Comparable { case typingText diff --git a/submodules/TelegramCore/TelegramCore/PeerPhotoUpdater.swift b/submodules/TelegramCore/TelegramCore/PeerPhotoUpdater.swift index d2fb1aca89..9c1ebed5e7 100644 --- a/submodules/TelegramCore/TelegramCore/PeerPhotoUpdater.swift +++ b/submodules/TelegramCore/TelegramCore/PeerPhotoUpdater.swift @@ -3,9 +3,11 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else @@ -13,7 +15,6 @@ import Foundation #endif import UIKit #endif -import TelegramApi public enum UpdatePeerPhotoStatus { case progress(Float) diff --git a/submodules/TelegramCore/TelegramCore/PeersNearby.swift b/submodules/TelegramCore/TelegramCore/PeersNearby.swift index e039dab027..0507c0a46a 100644 --- a/submodules/TelegramCore/TelegramCore/PeersNearby.swift +++ b/submodules/TelegramCore/TelegramCore/PeersNearby.swift @@ -2,11 +2,19 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif + +#if os(macOS) +private typealias SignalKitTimer = SwiftSignalKitMac.Timer +#else +private typealias SignalKitTimer = SwiftSignalKit.Timer +#endif + public struct PeerNearby { public let id: PeerId @@ -18,7 +26,7 @@ public final class PeersNearbyContext { private let queue: Queue = Queue.mainQueue() private var subscribers = Bag<([PeerNearby]?) -> Void>() private let disposable = MetaDisposable() - private var timer: SwiftSignalKit.Timer? + private var timer: SignalKitTimer? private var entries: [PeerNearby]? @@ -77,7 +85,7 @@ public final class PeersNearbyContext { } })) - self.timer = SwiftSignalKit.Timer(timeout: 2.0, repeat: true, completion: { [weak self] in + self.timer = SignalKitTimer(timeout: 2.0, repeat: true, completion: { [weak self] in guard let strongSelf = self else { return } diff --git a/submodules/TelegramCore/TelegramCore/PendingMessageManager.swift b/submodules/TelegramCore/TelegramCore/PendingMessageManager.swift index 4b39c1c9a8..c6ab6f9d85 100644 --- a/submodules/TelegramCore/TelegramCore/PendingMessageManager.swift +++ b/submodules/TelegramCore/TelegramCore/PendingMessageManager.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public struct PendingMessageStatus: Equatable { public let isRunning: Bool diff --git a/submodules/TelegramCore/TelegramCore/PendingMessageUploadedContent.swift b/submodules/TelegramCore/TelegramCore/PendingMessageUploadedContent.swift index 0dc3c1d21d..bfbe5a6924 100644 --- a/submodules/TelegramCore/TelegramCore/PendingMessageUploadedContent.swift +++ b/submodules/TelegramCore/TelegramCore/PendingMessageUploadedContent.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi import TelegramCorePrivateModule diff --git a/submodules/TelegramCore/TelegramCore/Polls.swift b/submodules/TelegramCore/TelegramCore/Polls.swift index 307976c3ce..c6223c533d 100644 --- a/submodules/TelegramCore/TelegramCore/Polls.swift +++ b/submodules/TelegramCore/TelegramCore/Polls.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi public enum RequestMessageSelectPollOptionError { case generic diff --git a/submodules/TelegramCore/TelegramCore/PrivacySettings.swift b/submodules/TelegramCore/TelegramCore/PrivacySettings.swift index 70bcca3ced..00651e8dad 100644 --- a/submodules/TelegramCore/TelegramCore/PrivacySettings.swift +++ b/submodules/TelegramCore/TelegramCore/PrivacySettings.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public final class SelectivePrivacyPeer: Equatable { public let peer: Peer diff --git a/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift b/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift index e97f1ca905..0b950bf85c 100644 --- a/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi private enum MessageParsingError: Error { case contentParsingError diff --git a/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingEncryptedOperations.swift b/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingEncryptedOperations.swift index 5fe931c3a8..729ee6f098 100644 --- a/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingEncryptedOperations.swift +++ b/submodules/TelegramCore/TelegramCore/ProcessSecretChatIncomingEncryptedOperations.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi private enum MessagePreParsingError: Error { case invalidChatState diff --git a/submodules/TelegramCore/TelegramCore/RateCall.swift b/submodules/TelegramCore/TelegramCore/RateCall.swift index e7d4830f32..d1727dfd8c 100644 --- a/submodules/TelegramCore/TelegramCore/RateCall.swift +++ b/submodules/TelegramCore/TelegramCore/RateCall.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi public func rateCall(account: Account, callId: CallId, starsCount: Int32, comment: String = "", userInitiated: Bool) -> Signal { var flags: Int32 = 0 diff --git a/submodules/TelegramCore/TelegramCore/RecentAccountSession.swift b/submodules/TelegramCore/TelegramCore/RecentAccountSession.swift index df7df1c088..d148cd0340 100644 --- a/submodules/TelegramCore/TelegramCore/RecentAccountSession.swift +++ b/submodules/TelegramCore/TelegramCore/RecentAccountSession.swift @@ -1,5 +1,9 @@ import Foundation +#if os(macOS) +import TelegramApiMac +#else import TelegramApi +#endif public struct AccountSessionFlags: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/RecentAccountSessions.swift b/submodules/TelegramCore/TelegramCore/RecentAccountSessions.swift index 3ed3b77d74..4758e7a378 100644 --- a/submodules/TelegramCore/TelegramCore/RecentAccountSessions.swift +++ b/submodules/TelegramCore/TelegramCore/RecentAccountSessions.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func requestRecentAccountSessions(account: Account) -> Signal<[RecentAccountSession], NoError> { return account.network.request(Api.functions.account.getAuthorizations()) diff --git a/submodules/TelegramCore/TelegramCore/RecentPeers.swift b/submodules/TelegramCore/TelegramCore/RecentPeers.swift index 3af75b4007..f215ea98fc 100644 --- a/submodules/TelegramCore/TelegramCore/RecentPeers.swift +++ b/submodules/TelegramCore/TelegramCore/RecentPeers.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum RecentPeers { case peers([Peer]) diff --git a/submodules/TelegramCore/TelegramCore/RecentWebSessions.swift b/submodules/TelegramCore/TelegramCore/RecentWebSessions.swift index c7b4754706..25298d4bab 100644 --- a/submodules/TelegramCore/TelegramCore/RecentWebSessions.swift +++ b/submodules/TelegramCore/TelegramCore/RecentWebSessions.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public struct WebAuthorization : Equatable { public let hash: Int64 diff --git a/submodules/TelegramCore/TelegramCore/RegisterNotificationToken.swift b/submodules/TelegramCore/TelegramCore/RegisterNotificationToken.swift index 1cfa65be8e..a0e9e22569 100644 --- a/submodules/TelegramCore/TelegramCore/RegisterNotificationToken.swift +++ b/submodules/TelegramCore/TelegramCore/RegisterNotificationToken.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import SwiftSignalKitMac import PostboxMac +import TelegramApiMac #else import SwiftSignalKit import Postbox -#endif import TelegramApi +#endif public enum NotificationTokenType { case aps(encrypt: Bool) diff --git a/submodules/TelegramCore/TelegramCore/RemovePeerMember.swift b/submodules/TelegramCore/TelegramCore/RemovePeerMember.swift index bc59b46e54..f084a7e1af 100644 --- a/submodules/TelegramCore/TelegramCore/RemovePeerMember.swift +++ b/submodules/TelegramCore/TelegramCore/RemovePeerMember.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func removePeerMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal { if peerId.namespace == Namespaces.Peer.CloudChannel { diff --git a/submodules/TelegramCore/TelegramCore/ReplyMarkupMessageAttribute.swift b/submodules/TelegramCore/TelegramCore/ReplyMarkupMessageAttribute.swift index 47b9e6d74e..7ffbf0f5dc 100644 --- a/submodules/TelegramCore/TelegramCore/ReplyMarkupMessageAttribute.swift +++ b/submodules/TelegramCore/TelegramCore/ReplyMarkupMessageAttribute.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum ReplyMarkupButtonAction: PostboxCoding, Equatable { case text diff --git a/submodules/TelegramCore/TelegramCore/ReportPeer.swift b/submodules/TelegramCore/TelegramCore/ReportPeer.swift index 578167ab7b..42585d0420 100644 --- a/submodules/TelegramCore/TelegramCore/ReportPeer.swift +++ b/submodules/TelegramCore/TelegramCore/ReportPeer.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func reportPeer(account: Account, peerId: PeerId) -> Signal { return account.postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/RequestChatContextResults.swift b/submodules/TelegramCore/TelegramCore/RequestChatContextResults.swift index 5831f467df..9932eae547 100644 --- a/submodules/TelegramCore/TelegramCore/RequestChatContextResults.swift +++ b/submodules/TelegramCore/TelegramCore/RequestChatContextResults.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func requestChatContextResults(account: Account, botId: PeerId, peerId: PeerId, query: String, location: Signal<(Double, Double)?, NoError> = .single(nil), offset: String) -> Signal { return combineLatest(account.postbox.transaction { transaction -> (bot: Peer, peer: Peer)? in diff --git a/submodules/TelegramCore/TelegramCore/RequestEditMessage.swift b/submodules/TelegramCore/TelegramCore/RequestEditMessage.swift index db9db79f43..3cb90b9ed0 100644 --- a/submodules/TelegramCore/TelegramCore/RequestEditMessage.swift +++ b/submodules/TelegramCore/TelegramCore/RequestEditMessage.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum RequestEditMessageMedia : Equatable { case keep diff --git a/submodules/TelegramCore/TelegramCore/RequestMessageActionCallback.swift b/submodules/TelegramCore/TelegramCore/RequestMessageActionCallback.swift index 6f7029d6ba..0586179174 100644 --- a/submodules/TelegramCore/TelegramCore/RequestMessageActionCallback.swift +++ b/submodules/TelegramCore/TelegramCore/RequestMessageActionCallback.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum MessageActionCallbackResult { case none diff --git a/submodules/TelegramCore/TelegramCore/RequestPhoneNumber.swift b/submodules/TelegramCore/TelegramCore/RequestPhoneNumber.swift index 5ba1b42152..3668acad1d 100644 --- a/submodules/TelegramCore/TelegramCore/RequestPhoneNumber.swift +++ b/submodules/TelegramCore/TelegramCore/RequestPhoneNumber.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi +#endif public func requestPhoneNumber(account: Account, peerId: PeerId) -> Signal { return .never() diff --git a/submodules/TelegramCore/TelegramCore/RequestSecureIdForm.swift b/submodules/TelegramCore/TelegramCore/RequestSecureIdForm.swift index 01c0739dc8..a2e0e5c7f7 100644 --- a/submodules/TelegramCore/TelegramCore/RequestSecureIdForm.swift +++ b/submodules/TelegramCore/TelegramCore/RequestSecureIdForm.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi public enum RequestSecureIdFormError { case generic diff --git a/submodules/TelegramCore/TelegramCore/RequestStartBot.swift b/submodules/TelegramCore/TelegramCore/RequestStartBot.swift index f0d9f8e456..f81ef86bca 100644 --- a/submodules/TelegramCore/TelegramCore/RequestStartBot.swift +++ b/submodules/TelegramCore/TelegramCore/RequestStartBot.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func requestStartBot(account: Account, botPeerId: PeerId, payload: String?) -> Signal { if let payload = payload, !payload.isEmpty { diff --git a/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift b/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift index 656839e7b2..1d7b9f3b3f 100644 --- a/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift +++ b/submodules/TelegramCore/TelegramCore/RequestUserPhotos.swift @@ -4,16 +4,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public struct TelegramPeerPhoto { public let image: TelegramMediaImage diff --git a/submodules/TelegramCore/TelegramCore/ResolvePeerByName.swift b/submodules/TelegramCore/TelegramCore/ResolvePeerByName.swift index a12f3af80e..d59ad484d2 100644 --- a/submodules/TelegramCore/TelegramCore/ResolvePeerByName.swift +++ b/submodules/TelegramCore/TelegramCore/ResolvePeerByName.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi final class CachedResolvedByNamePeer: PostboxCoding { let peerId: PeerId? diff --git a/submodules/TelegramCore/TelegramCore/RichText.swift b/submodules/TelegramCore/TelegramCore/RichText.swift index 21cdf83610..a56ced19a9 100644 --- a/submodules/TelegramCore/TelegramCore/RichText.swift +++ b/submodules/TelegramCore/TelegramCore/RichText.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi private enum RichTextTypes: Int32 { case empty = 0 diff --git a/submodules/TelegramCore/TelegramCore/SaveSecureIdValue.swift b/submodules/TelegramCore/TelegramCore/SaveSecureIdValue.swift index a85ac79c2e..a8e19306a9 100644 --- a/submodules/TelegramCore/TelegramCore/SaveSecureIdValue.swift +++ b/submodules/TelegramCore/TelegramCore/SaveSecureIdValue.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi public enum SaveSecureIdValueError { case generic diff --git a/submodules/TelegramCore/TelegramCore/SearchMessages.swift b/submodules/TelegramCore/TelegramCore/SearchMessages.swift index 1d6daa48c5..5fb26815b1 100644 --- a/submodules/TelegramCore/TelegramCore/SearchMessages.swift +++ b/submodules/TelegramCore/TelegramCore/SearchMessages.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum SearchMessagesLocation: Equatable { case general diff --git a/submodules/TelegramCore/TelegramCore/SearchPeers.swift b/submodules/TelegramCore/TelegramCore/SearchPeers.swift index 2d6d14a53a..f80ae494da 100644 --- a/submodules/TelegramCore/TelegramCore/SearchPeers.swift +++ b/submodules/TelegramCore/TelegramCore/SearchPeers.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public struct FoundPeer: Equatable { public let peer: Peer diff --git a/submodules/TelegramCore/TelegramCore/SearchStickers.swift b/submodules/TelegramCore/TelegramCore/SearchStickers.swift index 750716a324..60b866388f 100644 --- a/submodules/TelegramCore/TelegramCore/SearchStickers.swift +++ b/submodules/TelegramCore/TelegramCore/SearchStickers.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public final class FoundStickerItem: Equatable { public let file: TelegramMediaFile diff --git a/submodules/TelegramCore/TelegramCore/SecretChatEncryptionConfig.swift b/submodules/TelegramCore/TelegramCore/SecretChatEncryptionConfig.swift index c03cf1946d..0274690b2b 100644 --- a/submodules/TelegramCore/TelegramCore/SecretChatEncryptionConfig.swift +++ b/submodules/TelegramCore/TelegramCore/SecretChatEncryptionConfig.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public final class SecretChatEncryptionConfig: PostboxCoding { let g: Int32 diff --git a/submodules/TelegramCore/TelegramCore/SecretChatFileReference.swift b/submodules/TelegramCore/TelegramCore/SecretChatFileReference.swift index 570e1a1302..7005c6456e 100644 --- a/submodules/TelegramCore/TelegramCore/SecretChatFileReference.swift +++ b/submodules/TelegramCore/TelegramCore/SecretChatFileReference.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi final class SecretChatFileReference: PostboxCoding { let id: Int64 diff --git a/submodules/TelegramCore/TelegramCore/SecretChatIncomingEncryptedOperation.swift b/submodules/TelegramCore/TelegramCore/SecretChatIncomingEncryptedOperation.swift index 793c811cd3..3050554beb 100644 --- a/submodules/TelegramCore/TelegramCore/SecretChatIncomingEncryptedOperation.swift +++ b/submodules/TelegramCore/TelegramCore/SecretChatIncomingEncryptedOperation.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi enum SecretChatIncomingEncryptedOperationType: Int32 { case message diff --git a/submodules/TelegramCore/TelegramCore/SecretChatOutgoingOperation.swift b/submodules/TelegramCore/TelegramCore/SecretChatOutgoingOperation.swift index c6ffc9826c..1c91ef2d9c 100644 --- a/submodules/TelegramCore/TelegramCore/SecretChatOutgoingOperation.swift +++ b/submodules/TelegramCore/TelegramCore/SecretChatOutgoingOperation.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi private enum SecretChatOutgoingFileValue: Int32 { case remote = 0 diff --git a/submodules/TelegramCore/TelegramCore/SecureFileMediaResource.swift b/submodules/TelegramCore/TelegramCore/SecureFileMediaResource.swift index ab902167f4..e776e98bf1 100644 --- a/submodules/TelegramCore/TelegramCore/SecureFileMediaResource.swift +++ b/submodules/TelegramCore/TelegramCore/SecureFileMediaResource.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct SecureFileMediaResourceId: MediaResourceId { let fileId: Int64 diff --git a/submodules/TelegramCore/TelegramCore/SecureIdConfiguration.swift b/submodules/TelegramCore/TelegramCore/SecureIdConfiguration.swift index d0338b0f74..7568e1f2de 100644 --- a/submodules/TelegramCore/TelegramCore/SecureIdConfiguration.swift +++ b/submodules/TelegramCore/TelegramCore/SecureIdConfiguration.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox +import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Postbox #endif import SwiftSignalKit #endif -import TelegramApi final class CachedSecureIdConfiguration: PostboxCoding { let value: SecureIdConfiguration diff --git a/submodules/TelegramCore/TelegramCore/SecureIdDataTypes.swift b/submodules/TelegramCore/TelegramCore/SecureIdDataTypes.swift index ccb40d60a9..10bb59090c 100644 --- a/submodules/TelegramCore/TelegramCore/SecureIdDataTypes.swift +++ b/submodules/TelegramCore/TelegramCore/SecureIdDataTypes.swift @@ -1,5 +1,9 @@ import Foundation +#if os(macOS) +import TelegramApiMac +#else import TelegramApi +#endif public struct SecureIdPersonName: Equatable { public let firstName: String diff --git a/submodules/TelegramCore/TelegramCore/SecureIdValueContentError.swift b/submodules/TelegramCore/TelegramCore/SecureIdValueContentError.swift index 5d00af1741..cab7c59106 100644 --- a/submodules/TelegramCore/TelegramCore/SecureIdValueContentError.swift +++ b/submodules/TelegramCore/TelegramCore/SecureIdValueContentError.swift @@ -1,5 +1,10 @@ import Foundation +#if os(macOS) +import TelegramApiMac +#else import TelegramApi +#endif + public enum SecureIdValueContentErrorKey: Hashable { case value(SecureIdValueKey) diff --git a/submodules/TelegramCore/TelegramCore/Serialization.swift b/submodules/TelegramCore/TelegramCore/Serialization.swift index 5700faa366..81e2594098 100644 --- a/submodules/TelegramCore/TelegramCore/Serialization.swift +++ b/submodules/TelegramCore/TelegramCore/Serialization.swift @@ -1,14 +1,16 @@ import Foundation #if os(macOS) import MtProtoKitMac + import TelegramApiMac #else + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi + #if os(macOS) private let apiPrefix = "TelegramCoreMac.Api." diff --git a/submodules/TelegramCore/TelegramCore/SingleMessageView.swift b/submodules/TelegramCore/TelegramCore/SingleMessageView.swift index 38cb310b13..c265c00adf 100644 --- a/submodules/TelegramCore/TelegramCore/SingleMessageView.swift +++ b/submodules/TelegramCore/TelegramCore/SingleMessageView.swift @@ -3,16 +3,18 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi + public func singleMessageView(account: Account, messageId: MessageId, loadIfNotExists: Bool) -> Signal { return Signal { subscriber in diff --git a/submodules/TelegramCore/TelegramCore/StandaloneSendMessage.swift b/submodules/TelegramCore/TelegramCore/StandaloneSendMessage.swift index ab3bc4f865..692a5f5916 100644 --- a/submodules/TelegramCore/TelegramCore/StandaloneSendMessage.swift +++ b/submodules/TelegramCore/TelegramCore/StandaloneSendMessage.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum StandaloneMedia { case image(Data) diff --git a/submodules/TelegramCore/TelegramCore/StandaloneUploadedMedia.swift b/submodules/TelegramCore/TelegramCore/StandaloneUploadedMedia.swift index 872a78560d..5b593a5645 100644 --- a/submodules/TelegramCore/TelegramCore/StandaloneUploadedMedia.swift +++ b/submodules/TelegramCore/TelegramCore/StandaloneUploadedMedia.swift @@ -2,12 +2,14 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else + import TelegramApi import Postbox import SwiftSignalKit import UIKit #endif -import TelegramApi + public enum StandaloneUploadMediaError { case generic diff --git a/submodules/TelegramCore/TelegramCore/StickerManagement.swift b/submodules/TelegramCore/TelegramCore/StickerManagement.swift index 288d971f2c..b4e594340d 100644 --- a/submodules/TelegramCore/TelegramCore/StickerManagement.swift +++ b/submodules/TelegramCore/TelegramCore/StickerManagement.swift @@ -2,12 +2,13 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else + import TelegramApi import Postbox import SwiftSignalKit #endif import TelegramCorePrivateModule -import TelegramApi private func hashForIdsReverse(_ ids: [Int64]) -> Int32 { var acc: UInt32 = 0 diff --git a/submodules/TelegramCore/TelegramCore/StickerPack.swift b/submodules/TelegramCore/TelegramCore/StickerPack.swift index fc56ae4565..734f9e3cc1 100644 --- a/submodules/TelegramCore/TelegramCore/StickerPack.swift +++ b/submodules/TelegramCore/TelegramCore/StickerPack.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi public struct StickerPackCollectionInfoFlags: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/StickerSetInstallation.swift b/submodules/TelegramCore/TelegramCore/StickerSetInstallation.swift index 5bdfc9685c..a22a100c4c 100644 --- a/submodules/TelegramCore/TelegramCore/StickerSetInstallation.swift +++ b/submodules/TelegramCore/TelegramCore/StickerSetInstallation.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum RequestStickerSetError { case generic diff --git a/submodules/TelegramCore/TelegramCore/StoreMessage_Telegram.swift b/submodules/TelegramCore/TelegramCore/StoreMessage_Telegram.swift index 46a146fde2..48ad3d69ad 100644 --- a/submodules/TelegramCore/TelegramCore/StoreMessage_Telegram.swift +++ b/submodules/TelegramCore/TelegramCore/StoreMessage_Telegram.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public func tagsForStoreMessage(incoming: Bool, attributes: [MessageAttribute], media: [Media], textEntities: [MessageTextEntity]?) -> (MessageTags, GlobalMessageTags) { var isSecret = false diff --git a/submodules/TelegramCore/TelegramCore/SupportPeerId.swift b/submodules/TelegramCore/TelegramCore/SupportPeerId.swift index 1a753f7705..4932997687 100644 --- a/submodules/TelegramCore/TelegramCore/SupportPeerId.swift +++ b/submodules/TelegramCore/TelegramCore/SupportPeerId.swift @@ -2,16 +2,17 @@ import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func supportPeerId(account:Account) -> Signal { return account.network.request(Api.functions.help.getSupport()) diff --git a/submodules/TelegramCore/TelegramCore/SynchronizePeerReadState.swift b/submodules/TelegramCore/TelegramCore/SynchronizePeerReadState.swift index ff083a574c..2dc8384a5f 100644 --- a/submodules/TelegramCore/TelegramCore/SynchronizePeerReadState.swift +++ b/submodules/TelegramCore/TelegramCore/SynchronizePeerReadState.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi private enum VerifyReadStateError { case Abort diff --git a/submodules/TelegramCore/TelegramCore/SynchronizeSavedStickersOperation.swift b/submodules/TelegramCore/TelegramCore/SynchronizeSavedStickersOperation.swift index ae239f35e5..7e985d73da 100644 --- a/submodules/TelegramCore/TelegramCore/SynchronizeSavedStickersOperation.swift +++ b/submodules/TelegramCore/TelegramCore/SynchronizeSavedStickersOperation.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi private enum SynchronizeSavedStickersOperationContentType: Int32 { case add diff --git a/submodules/TelegramCore/TelegramCore/TelegramChannelAdminRights.swift b/submodules/TelegramCore/TelegramCore/TelegramChannelAdminRights.swift index e6863e6a20..f6b879abd5 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramChannelAdminRights.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramChannelAdminRights.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct TelegramChatAdminRightsFlags: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/TelegramChannelBannedRights.swift b/submodules/TelegramCore/TelegramCore/TelegramChannelBannedRights.swift index eec5774905..87c0965365 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramChannelBannedRights.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramChannelBannedRights.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public struct TelegramChatBannedRightsFlags: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaAction.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaAction.swift index 9e5bb37ed2..43085a1b5c 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaAction.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaAction.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum PhoneCallDiscardReason: Int32 { case missed = 0 diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaFile.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaFile.swift index 69b298df6a..d7170bd462 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaFile.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaFile.swift @@ -1,11 +1,13 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi + private let typeFileName: Int32 = 0 private let typeSticker: Int32 = 1 diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaGame.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaGame.swift index 7613afa04c..bbf2b1a1ee 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaGame.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaGame.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public final class TelegramMediaGame: Media { public let gameId: Int64 diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaImage.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaImage.swift index 8d86637f75..310f7249d8 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaImage.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaImage.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi public enum TelegramMediaImageReference: PostboxCoding, Equatable { case cloud(imageId: Int64, accessHash: Int64, fileReference: Data?) diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaMap.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaMap.swift index 4602cd43d5..c06b658f11 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaMap.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaMap.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public final class NamedGeoPlace: PostboxCoding, Equatable { public let country: String? diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaPoll.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaPoll.swift index 67cd75f1a4..348a91a29a 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaPoll.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaPoll.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac +import TelegramApiMac #else import Postbox -#endif import TelegramApi +#endif public struct TelegramMediaPollOption: Equatable, PostboxCoding { public let text: String diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaWebDocument.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaWebDocument.swift index 002c4fe813..a49a6dec59 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaWebDocument.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaWebDocument.swift @@ -1,11 +1,13 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi + public class TelegramMediaWebFile: Media { public let resource: TelegramMediaResource diff --git a/submodules/TelegramCore/TelegramCore/TelegramMediaWebpage.swift b/submodules/TelegramCore/TelegramCore/TelegramMediaWebpage.swift index 4e86879a6f..949d822c87 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramMediaWebpage.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramMediaWebpage.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi public final class TelegramMediaWebpageLoadedContent: PostboxCoding, Equatable { public let url: String diff --git a/submodules/TelegramCore/TelegramCore/TelegramPeerNotificationSettings.swift b/submodules/TelegramCore/TelegramCore/TelegramPeerNotificationSettings.swift index d5a1a9e537..154d1b922b 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramPeerNotificationSettings.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramPeerNotificationSettings.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum PeerMuteState: Equatable { case `default` diff --git a/submodules/TelegramCore/TelegramCore/TelegramUser.swift b/submodules/TelegramCore/TelegramCore/TelegramUser.swift index 621cb5f2d4..b91ddc7a27 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramUser.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramUser.swift @@ -1,11 +1,12 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox import UIKit + import TelegramApi #endif -import TelegramApi public struct UserInfoFlags: OptionSet { public var rawValue: Int32 diff --git a/submodules/TelegramCore/TelegramCore/TelegramUserPresence.swift b/submodules/TelegramCore/TelegramCore/TelegramUserPresence.swift index 18ae7ff44c..937f102c01 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramUserPresence.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramUserPresence.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum UserPresenceStatus: Comparable, PostboxCoding { case none diff --git a/submodules/TelegramCore/TelegramCore/TermsOfService.swift b/submodules/TelegramCore/TelegramCore/TermsOfService.swift index 3b4370ac8b..f375589b24 100644 --- a/submodules/TelegramCore/TelegramCore/TermsOfService.swift +++ b/submodules/TelegramCore/TelegramCore/TermsOfService.swift @@ -3,7 +3,9 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac +import TelegramApiMac #else +import TelegramApi import Postbox import SwiftSignalKit #if BUCK @@ -12,7 +14,6 @@ import SwiftSignalKit import MtProtoKitDynamic #endif #endif -import TelegramApi public struct TermsOfServiceUpdate: Equatable { public let id: String diff --git a/submodules/TelegramCore/TelegramCore/TextEntitiesMessageAttribute.swift b/submodules/TelegramCore/TelegramCore/TextEntitiesMessageAttribute.swift index 28d74ff016..b97a5a4e48 100644 --- a/submodules/TelegramCore/TelegramCore/TextEntitiesMessageAttribute.swift +++ b/submodules/TelegramCore/TelegramCore/TextEntitiesMessageAttribute.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi public enum MessageTextEntityType: Equatable { public typealias CustomEntityType = Int32 diff --git a/submodules/TelegramCore/TelegramCore/ToggleChannelSignatures.swift b/submodules/TelegramCore/TelegramCore/ToggleChannelSignatures.swift index 6265efac45..74c1bba7dd 100644 --- a/submodules/TelegramCore/TelegramCore/ToggleChannelSignatures.swift +++ b/submodules/TelegramCore/TelegramCore/ToggleChannelSignatures.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func toggleShouldChannelMessagesSignatures(account:Account, peerId:PeerId, enabled: Bool) -> Signal { return account.postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/TwoStepVerification.swift b/submodules/TelegramCore/TelegramCore/TwoStepVerification.swift index 39a7d2e940..a69a79f203 100644 --- a/submodules/TelegramCore/TelegramCore/TwoStepVerification.swift +++ b/submodules/TelegramCore/TelegramCore/TwoStepVerification.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum TwoStepVerificationConfiguration { case notSet(pendingEmail: TwoStepVerificationPendingEmail?) diff --git a/submodules/TelegramCore/TelegramCore/UpdateAccountPeerName.swift b/submodules/TelegramCore/TelegramCore/UpdateAccountPeerName.swift index 2b94adb17d..83513b3018 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateAccountPeerName.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateAccountPeerName.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func updateAccountPeerName(account: Account, firstName: String, lastName: String) -> Signal { return account.network.request(Api.functions.account.updateProfile(flags: (1 << 0) | (1 << 1), firstName: firstName, lastName: lastName, about: nil)) diff --git a/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift b/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift index 2ed9433c45..6d13805ae1 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateCachedPeerData.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi func fetchAndUpdateSupplementalCachedPeerData(peerId rawPeerId: PeerId, network: Network, postbox: Postbox) -> Signal { return postbox.transaction { transaction -> Signal in diff --git a/submodules/TelegramCore/TelegramCore/UpdateContactName.swift b/submodules/TelegramCore/TelegramCore/UpdateContactName.swift index ab9b198391..8cdf628d9c 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateContactName.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateContactName.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum UpdateContactNameError { case generic diff --git a/submodules/TelegramCore/TelegramCore/UpdateGroup.swift b/submodules/TelegramCore/TelegramCore/UpdateGroup.swift index 4613303c83..2504739e31 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateGroup.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateGroup.swift @@ -1,5 +1,9 @@ import Foundation +#if os(macOS) +import TelegramApiMac +#else import TelegramApi +#endif enum UpdateGroup { case withPts(updates: [Api.Update], users: [Api.User], chats: [Api.Chat]) diff --git a/submodules/TelegramCore/TelegramCore/UpdateGroupSpecificStickerset.swift b/submodules/TelegramCore/TelegramCore/UpdateGroupSpecificStickerset.swift index 3279318521..804f3096b2 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateGroupSpecificStickerset.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateGroupSpecificStickerset.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public enum UpdateGroupSpecificStickersetError { case generic diff --git a/submodules/TelegramCore/TelegramCore/UpdateMessageMedia.swift b/submodules/TelegramCore/TelegramCore/UpdateMessageMedia.swift index faa642f69f..acc02d00cf 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateMessageMedia.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateMessageMedia.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac +import TelegramApiMac #else import Postbox -#endif import TelegramApi +#endif func updateMessageMedia(transaction: Transaction, id: MediaId, media: Media?) { let updatedMessageIndices = transaction.updateMedia(id, update: media) diff --git a/submodules/TelegramCore/TelegramCore/UpdateMessageService.swift b/submodules/TelegramCore/TelegramCore/UpdateMessageService.swift index a0a944080e..0f1676ecd2 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateMessageService.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateMessageService.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi class UpdateMessageService: NSObject, MTMessageService { var peerId: PeerId! diff --git a/submodules/TelegramCore/TelegramCore/UpdatePeerInfo.swift b/submodules/TelegramCore/TelegramCore/UpdatePeerInfo.swift index 0eb584952b..aa395f18af 100644 --- a/submodules/TelegramCore/TelegramCore/UpdatePeerInfo.swift +++ b/submodules/TelegramCore/TelegramCore/UpdatePeerInfo.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum UpdatePeerTitleError { case generic diff --git a/submodules/TelegramCore/TelegramCore/UpdatePeers.swift b/submodules/TelegramCore/TelegramCore/UpdatePeers.swift index 54e7ac0e97..3b94506f7b 100644 --- a/submodules/TelegramCore/TelegramCore/UpdatePeers.swift +++ b/submodules/TelegramCore/TelegramCore/UpdatePeers.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi func updatePeerChatInclusionWithMinTimestamp(transaction: Transaction, id: PeerId, minTimestamp: Int32, forceRootGroupIfNotExists: Bool) { let currentInclusion = transaction.getPeerChatListInclusion(id) diff --git a/submodules/TelegramCore/TelegramCore/UpdatePinnedMessage.swift b/submodules/TelegramCore/TelegramCore/UpdatePinnedMessage.swift index 967cb34dbd..b48242cfc2 100644 --- a/submodules/TelegramCore/TelegramCore/UpdatePinnedMessage.swift +++ b/submodules/TelegramCore/TelegramCore/UpdatePinnedMessage.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public enum UpdatePinnedMessageError { case generic diff --git a/submodules/TelegramCore/TelegramCore/UpdateSecretChat.swift b/submodules/TelegramCore/TelegramCore/UpdateSecretChat.swift index 75d87a587e..feb89aa59f 100644 --- a/submodules/TelegramCore/TelegramCore/UpdateSecretChat.swift +++ b/submodules/TelegramCore/TelegramCore/UpdateSecretChat.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi struct SecretChatRequestData { let g: Int32 diff --git a/submodules/TelegramCore/TelegramCore/UpdatedAccountPrivacySettings.swift b/submodules/TelegramCore/TelegramCore/UpdatedAccountPrivacySettings.swift index 978d1833f0..f335b6d504 100644 --- a/submodules/TelegramCore/TelegramCore/UpdatedAccountPrivacySettings.swift +++ b/submodules/TelegramCore/TelegramCore/UpdatedAccountPrivacySettings.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi import SwiftSignalKit #endif -import TelegramApi public func requestAccountPrivacySettings(account: Account) -> Signal { let lastSeenPrivacy = account.network.request(Api.functions.account.getPrivacy(key: .inputPrivacyKeyStatusTimestamp)) diff --git a/submodules/TelegramCore/TelegramCore/UpdatesApiUtils.swift b/submodules/TelegramCore/TelegramCore/UpdatesApiUtils.swift index 84714be64e..a44ed98572 100644 --- a/submodules/TelegramCore/TelegramCore/UpdatesApiUtils.swift +++ b/submodules/TelegramCore/TelegramCore/UpdatesApiUtils.swift @@ -1,10 +1,11 @@ import Foundation #if os(macOS) import PostboxMac + import TelegramApiMac #else import Postbox + import TelegramApi #endif -import TelegramApi private func collectPreCachedResources(for photo: Api.Photo) -> [(MediaResource, Data)]? { switch photo { diff --git a/submodules/TelegramCore/TelegramCore/VerifySecureIdValue.swift b/submodules/TelegramCore/TelegramCore/VerifySecureIdValue.swift index 1cdff27386..f7d9a98ddb 100644 --- a/submodules/TelegramCore/TelegramCore/VerifySecureIdValue.swift +++ b/submodules/TelegramCore/TelegramCore/VerifySecureIdValue.swift @@ -3,8 +3,10 @@ import Foundation import PostboxMac import MtProtoKitMac import SwiftSignalKitMac + import TelegramApiMac #else import Postbox + import TelegramApi #if BUCK import MtProtoKit #else @@ -12,7 +14,6 @@ import Foundation #endif import SwiftSignalKit #endif -import TelegramApi public enum SecureIdPreparePhoneVerificationError { case generic diff --git a/submodules/TelegramCore/TelegramCore/Wallpaper.swift b/submodules/TelegramCore/TelegramCore/Wallpaper.swift index 6fc00d18f6..7a56e2bcf8 100644 --- a/submodules/TelegramCore/TelegramCore/Wallpaper.swift +++ b/submodules/TelegramCore/TelegramCore/Wallpaper.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi +#endif public struct WallpaperSettings: PostboxCoding, Equatable { public let blur: Bool diff --git a/submodules/TelegramCore/TelegramCore/Wallpapers.swift b/submodules/TelegramCore/TelegramCore/Wallpapers.swift index a663cc154b..a84b61d740 100644 --- a/submodules/TelegramCore/TelegramCore/Wallpapers.swift +++ b/submodules/TelegramCore/TelegramCore/Wallpapers.swift @@ -2,11 +2,12 @@ import Foundation #if os(macOS) import PostboxMac import SwiftSignalKitMac +import TelegramApiMac #else import Postbox import SwiftSignalKit -#endif import TelegramApi +#endif final class CachedWallpapersConfiguration: PostboxCoding { let hash: Int32 diff --git a/submodules/TelegramCore/TelegramCore/WebpagePreview.swift b/submodules/TelegramCore/TelegramCore/WebpagePreview.swift index 3a1080b099..8a52f77688 100644 --- a/submodules/TelegramCore/TelegramCore/WebpagePreview.swift +++ b/submodules/TelegramCore/TelegramCore/WebpagePreview.swift @@ -3,16 +3,17 @@ import Foundation import PostboxMac import SwiftSignalKitMac import MtProtoKitMac + import TelegramApiMac #else import Postbox import SwiftSignalKit + import TelegramApi #if BUCK import MtProtoKit #else import MtProtoKitDynamic #endif #endif -import TelegramApi public func webpagePreview(account: Account, url: String, webpageId: MediaId? = nil) -> Signal { return webpagePreviewWithProgress(account: account, url: url) diff --git a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj index ebd8a4a8a0..e78181aaa8 100644 --- a/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramCore/TelegramCore_Xcode.xcodeproj/project.pbxproj @@ -673,6 +673,7 @@ D0CA8E4B227209C4008A74C3 /* ManagedSynchronizeGroupMessageStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0CA8E4A227209C4008A74C3 /* ManagedSynchronizeGroupMessageStats.swift */; }; D0CA8E4C227209C4008A74C3 /* ManagedSynchronizeGroupMessageStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0CA8E4A227209C4008A74C3 /* ManagedSynchronizeGroupMessageStats.swift */; }; D0CAF2EA1D75EC600011F558 /* MtProtoKitDynamic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0CAF2E91D75EC600011F558 /* MtProtoKitDynamic.framework */; }; + D0CC4ADC22BA47280088F36D /* TelegramApiMac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0CC4ADB22BA47280088F36D /* TelegramApiMac.framework */; }; D0D1026C2212FE52003ADA5E /* AccountSortOrderAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D1026B2212FE52003ADA5E /* AccountSortOrderAttribute.swift */; }; D0D1026D2212FE52003ADA5E /* AccountSortOrderAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D1026B2212FE52003ADA5E /* AccountSortOrderAttribute.swift */; }; D0D748021E7AE98B00F4B1F6 /* StickerPackInteractiveOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D748011E7AE98B00F4B1F6 /* StickerPackInteractiveOperations.swift */; }; @@ -1180,6 +1181,8 @@ D0CA3F83207391560042D2B6 /* SecureIdPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureIdPadding.swift; sourceTree = ""; }; D0CA8E4A227209C4008A74C3 /* ManagedSynchronizeGroupMessageStats.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManagedSynchronizeGroupMessageStats.swift; sourceTree = ""; }; D0CAF2E91D75EC600011F558 /* MtProtoKitDynamic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MtProtoKitDynamic.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0CC4AA322BA44960088F36D /* TelegramApi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramApi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0CC4ADB22BA47280088F36D /* TelegramApiMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramApiMac.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0D1026B2212FE52003ADA5E /* AccountSortOrderAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSortOrderAttribute.swift; sourceTree = ""; }; D0D748011E7AE98B00F4B1F6 /* StickerPackInteractiveOperations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StickerPackInteractiveOperations.swift; sourceTree = ""; }; D0DA1D311F7043D50034E892 /* ManagedPendingPeerNotificationSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManagedPendingPeerNotificationSettings.swift; sourceTree = ""; }; @@ -1270,6 +1273,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0CC4ADC22BA47280088F36D /* TelegramApiMac.framework in Frameworks */, D0B4187F1D7E054E004562A4 /* MtProtoKitMac.framework in Frameworks */, D0B418721D7E0409004562A4 /* PostboxMac.framework in Frameworks */, D0B418731D7E0409004562A4 /* SwiftSignalKitMac.framework in Frameworks */, @@ -1730,6 +1734,8 @@ D06706631D512ADA00DED3E3 /* Frameworks */ = { isa = PBXGroup; children = ( + D0CC4ADB22BA47280088F36D /* TelegramApiMac.framework */, + D0CC4AA322BA44960088F36D /* TelegramApi.framework */, D035732E22B5C24F00F0920D /* TelegramApi.framework */, D0AF32371FAE8C910097362B /* MultipeerConnectivity.framework */, D0B4187E1D7E054E004562A4 /* MtProtoKitMac.framework */, @@ -3232,6 +3238,141 @@ }; name = DebugFork; }; + D0364D4D22B3E37C002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D03B0E591D63215200955575 /* TelegramCore.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/third-party/FFmpeg-iOS/include"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = HockeyappMacAlpha; + }; + D0364D4E22B3E37C002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D03B0E591D63215200955575 /* TelegramCore.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Manual; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = TelegramCore/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/third-party/FFmpeg-iOS/lib", + "$(PROJECT_DIR)/third-party/libwebp/lib", + ); + MODULEMAP_PRIVATE_FILE = "$(SRCROOT)/TelegramCore/module.private.modulemap"; + OTHER_LDFLAGS = "-Wl,-dead_strip"; + OTHER_SWIFT_FLAGS = "-DDEBUG"; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.TelegramCore; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_REFLECTION_METADATA_LEVEL = all; + SWIFT_VERSION = 4.0; + USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/third-party/FFmpeg-iOS/include"; + }; + name = HockeyappMacAlpha; + }; + D0364D4F22B3E37C002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D03B0E591D63215200955575 /* TelegramCore.xcconfig */; + buildSettings = { + INFOPLIST_FILE = TelegramCoreTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.TelegramCoreTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = HockeyappMacAlpha; + }; + D0364D5022B3E37C002A6EF0 /* HockeyappMacAlpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D03B0E591D63215200955575 /* TelegramCore.xcconfig */; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + FRAMEWORK_VERSION = A; + GCC_OPTIMIZATION_LEVEL = 0; + INFOPLIST_FILE = TelegramCoreMac/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MODULEMAP_PRIVATE_FILE = "$(SRCROOT)/TelegramCore/module.private-mac.modulemap"; + OTHER_SWIFT_FLAGS = "-DDEBUG"; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.TelegramCoreMac; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; + }; + name = HockeyappMacAlpha; + }; D06706551D51162400DED3E3 /* ReleaseAppStore */ = { isa = XCBuildConfiguration; baseConfigurationReference = D03B0E591D63215200955575 /* TelegramCore.xcconfig */; @@ -3999,6 +4140,7 @@ isa = XCConfigurationList; buildConfigurations = ( D09D8C131D4FAB1D0081DBEC /* DebugHockeyapp */, + D0364D4D22B3E37C002A6EF0 /* HockeyappMacAlpha */, D021D508219CB1E40064BEBA /* DebugFork */, D09D8C141D4FAB1D0081DBEC /* DebugAppStore */, D0ADF934212B3ADA00310BBC /* DebugAppStoreLLC */, @@ -4014,6 +4156,7 @@ isa = XCConfigurationList; buildConfigurations = ( D09D8C161D4FAB1D0081DBEC /* DebugHockeyapp */, + D0364D4E22B3E37C002A6EF0 /* HockeyappMacAlpha */, D021D509219CB1E40064BEBA /* DebugFork */, D09D8C171D4FAB1D0081DBEC /* DebugAppStore */, D0ADF935212B3ADA00310BBC /* DebugAppStoreLLC */, @@ -4029,6 +4172,7 @@ isa = XCConfigurationList; buildConfigurations = ( D09D8C191D4FAB1D0081DBEC /* DebugHockeyapp */, + D0364D4F22B3E37C002A6EF0 /* HockeyappMacAlpha */, D021D50A219CB1E40064BEBA /* DebugFork */, D09D8C1A1D4FAB1D0081DBEC /* DebugAppStore */, D0ADF936212B3ADA00310BBC /* DebugAppStoreLLC */, @@ -4044,6 +4188,7 @@ isa = XCConfigurationList; buildConfigurations = ( D0B4186D1D7E03D5004562A4 /* DebugHockeyapp */, + D0364D5022B3E37C002A6EF0 /* HockeyappMacAlpha */, D021D50B219CB1E40064BEBA /* DebugFork */, D0B4186E1D7E03D5004562A4 /* DebugAppStore */, D0ADF937212B3ADA00310BBC /* DebugAppStoreLLC */,