diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index 1be3bd63d8..c8bd653315 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -220,7 +220,6 @@ D00859A21B28189D00EAF753 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00859A11B28189D00EAF753 /* AppDelegate.swift */; }; D00859A91B28189D00EAF753 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D00859A81B28189D00EAF753 /* Images.xcassets */; }; D00859AC1B28189D00EAF753 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = D00859AA1B28189D00EAF753 /* LaunchScreen.xib */; }; - D00859B81B28189D00EAF753 /* Telegram_iOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00859B71B28189D00EAF753 /* Telegram_iOSTests.swift */; }; D00ED75A1FE94630001F38BD /* AppIntentVocabulary.plist in Resources */ = {isa = PBXBuildFile; fileRef = D00ED7581FE94630001F38BD /* AppIntentVocabulary.plist */; }; D00ED75D1FE95287001F38BD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D00ED75B1FE95287001F38BD /* InfoPlist.strings */; }; D015E011225CCEB300CB9E8A /* ReadBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D015E010225CCEB300CB9E8A /* ReadBuffer.swift */; }; @@ -247,7 +246,6 @@ D03B0E8A1D634B1100955575 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03B0E871D634B1100955575 /* Display.framework */; }; D03B0E8B1D634B1100955575 /* SwiftSignalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03B0E881D634B1100955575 /* SwiftSignalKit.framework */; }; D03B0E8C1D634B1100955575 /* TelegramCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03B0E891D634B1100955575 /* TelegramCore.framework */; }; - D03BCCCA1C6EBD670097A291 /* ListViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03BCCC91C6EBD670097A291 /* ListViewTests.swift */; }; D04DCC211F71C80000B021D7 /* 0.m4a in Resources */ = {isa = PBXBuildFile; fileRef = D04DCC0B1F71C80000B021D7 /* 0.m4a */; }; D04DCC221F71C80000B021D7 /* 1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = D04DCC0C1F71C80000B021D7 /* 1.m4a */; }; D04DCC231F71C80000B021D7 /* 100.m4a in Resources */ = {isa = PBXBuildFile; fileRef = D04DCC0D1F71C80000B021D7 /* 100.m4a */; }; @@ -465,13 +463,6 @@ remoteGlobalIDString = D000CAC721FB6E370011B15D; remoteInfo = NotificationService; }; - D00859B21B28189D00EAF753 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D00859941B28189D00EAF753 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D008599B1B28189D00EAF753; - remoteInfo = "Telegram-iOS"; - }; D02CF606215D9ABF00E0F56A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D00859941B28189D00EAF753 /* Project object */; @@ -928,7 +919,6 @@ D00859A11B28189D00EAF753 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; D00859A81B28189D00EAF753 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; D00859AB1B28189D00EAF753 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - D00859B11B28189D00EAF753 /* Telegram-iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Telegram-iOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; D00859B61B28189D00EAF753 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D00859B71B28189D00EAF753 /* Telegram_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Telegram_iOSTests.swift; sourceTree = ""; }; D00ED7591FE94630001F38BD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = en.lproj/AppIntentVocabulary.plist; sourceTree = ""; }; @@ -1246,13 +1236,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D00859AE1B28189D00EAF753 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; D02CF5F9215D9ABE00E0F56A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1959,7 +1942,6 @@ isa = PBXGroup; children = ( D008599C1B28189D00EAF753 /* Telegram X.app */, - D00859B11B28189D00EAF753 /* Telegram-iOSTests.xctest */, D03B0E781D63484500955575 /* Share.appex */, D0D268761D79A70A00C422DA /* SiriIntents.appex */, D0ECCB7C1FE9C38500609802 /* Telegram-iOS UITests.xctest */, @@ -2639,24 +2621,6 @@ productReference = D008599C1B28189D00EAF753 /* Telegram X.app */; productType = "com.apple.product-type.application"; }; - D00859B01B28189D00EAF753 /* Telegram-iOSTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = D00859BE1B28189D00EAF753 /* Build configuration list for PBXNativeTarget "Telegram-iOSTests" */; - buildPhases = ( - D00859AD1B28189D00EAF753 /* Sources */, - D00859AE1B28189D00EAF753 /* Frameworks */, - D00859AF1B28189D00EAF753 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - D00859B31B28189D00EAF753 /* PBXTargetDependency */, - ); - name = "Telegram-iOSTests"; - productName = "Telegram-iOSTests"; - productReference = D00859B11B28189D00EAF753 /* Telegram-iOSTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; D02CF5FB215D9ABE00E0F56A /* NotificationContent */ = { isa = PBXNativeTarget; buildConfigurationList = D02CF610215D9ABF00E0F56A /* Build configuration list for PBXNativeTarget "NotificationContent" */; @@ -2794,11 +2758,6 @@ }; }; }; - D00859B01B28189D00EAF753 = { - CreatedOnToolsVersion = 6.3.1; - ProvisioningStyle = Manual; - TestTargetID = D008599B1B28189D00EAF753; - }; D02CF5FB215D9ABE00E0F56A = { CreatedOnToolsVersion = 10.0; DevelopmentTeam = X834Q8SBVP; @@ -2855,6 +2814,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, pt, @@ -2872,7 +2832,6 @@ projectRoot = ""; targets = ( D008599B1B28189D00EAF753 /* Telegram-iOS */, - D00859B01B28189D00EAF753 /* Telegram-iOSTests */, D03B0E771D63484500955575 /* Share */, D0D268751D79A70A00C422DA /* SiriIntents */, D0ECCB7B1FE9C38500609802 /* Telegram-iOS UITests */, @@ -3012,13 +2971,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D00859AF1B28189D00EAF753 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; D02CF5FA215D9ABE00E0F56A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -3329,15 +3281,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D00859AD1B28189D00EAF753 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D03BCCCA1C6EBD670097A291 /* ListViewTests.swift in Sources */, - D00859B81B28189D00EAF753 /* Telegram_iOSTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D02CF5F8215D9ABE00E0F56A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3411,11 +3354,6 @@ target = D000CAC721FB6E370011B15D /* NotificationService */; targetProxy = D000CACD21FB6E380011B15D /* PBXContainerItemProxy */; }; - D00859B31B28189D00EAF753 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D008599B1B28189D00EAF753 /* Telegram-iOS */; - targetProxy = D00859B21B28189D00EAF753 /* PBXContainerItemProxy */; - }; D02CF607215D9ABF00E0F56A /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D02CF5FB215D9ABE00E0F56A /* NotificationContent */; @@ -5348,49 +5286,6 @@ }; name = ReleaseAppStore; }; - D00859BF1B28189D00EAF753 /* DebugHockeyapp */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D0338735223A9A99007A2CE4 /* Config-Hockeyapp-Internal.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = DebugHockeyapp; - }; - D00859C01B28189D00EAF753 /* ReleaseAppStore */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D079FD021F06BBD60038FADE /* Config-AppStore.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = ReleaseAppStore; - }; D021D4DE219CB13A0064BEBA /* DebugFork */ = { isa = XCBuildConfiguration; baseConfigurationReference = D021D4D8219CAEDD0064BEBA /* Config-Fork.xcconfig */; @@ -5486,29 +5381,6 @@ }; name = DebugFork; }; - D021D4E0219CB13A0064BEBA /* DebugFork */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D021D4D8219CAEDD0064BEBA /* Config-Fork.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = DebugFork; - }; D021D4E1219CB13A0064BEBA /* DebugFork */ = { isa = XCBuildConfiguration; baseConfigurationReference = D021D4D8219CAEDD0064BEBA /* Config-Fork.xcconfig */; @@ -6531,29 +6403,6 @@ }; name = DebugAppStore; }; - D079FCFB1F06BBA40038FADE /* DebugAppStore */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D079FD021F06BBD60038FADE /* Config-AppStore.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = DebugAppStore; - }; D079FCFD1F06BBA40038FADE /* DebugAppStore */ = { isa = XCBuildConfiguration; baseConfigurationReference = D079FD021F06BBD60038FADE /* Config-AppStore.xcconfig */; @@ -6704,25 +6553,6 @@ }; name = ReleaseHockeyappInternal; }; - D0924FFB1FE52C46003F693F /* ReleaseHockeyappInternal */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D0338735223A9A99007A2CE4 /* Config-Hockeyapp-Internal.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = ReleaseHockeyappInternal; - }; D0924FFC1FE52C46003F693F /* ReleaseHockeyappInternal */ = { isa = XCBuildConfiguration; baseConfigurationReference = D0338735223A9A99007A2CE4 /* Config-Hockeyapp-Internal.xcconfig */; @@ -6878,29 +6708,6 @@ }; name = DebugAppStoreLLC; }; - D0ADF917212B3A9E00310BBC /* DebugAppStoreLLC */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D0ADF914212B399A00310BBC /* Config-AppStoreLLC.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = DebugAppStoreLLC; - }; D0ADF918212B3A9E00310BBC /* DebugAppStoreLLC */ = { isa = XCBuildConfiguration; baseConfigurationReference = D0ADF914212B399A00310BBC /* Config-AppStoreLLC.xcconfig */; @@ -7469,26 +7276,6 @@ }; name = ReleaseAppStoreLLC; }; - D0CE6F0F213DC33200BCD44B /* ReleaseAppStoreLLC */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D0ADF914212B399A00310BBC /* Config-AppStoreLLC.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"; - INFOPLIST_FILE = "Telegram-iOSTests/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - 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_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Telegram-iOS.app/Telegram-iOS"; - }; - name = ReleaseAppStoreLLC; - }; D0CE6F10213DC33200BCD44B /* ReleaseAppStoreLLC */ = { isa = XCBuildConfiguration; baseConfigurationReference = D0ADF914212B399A00310BBC /* Config-AppStoreLLC.xcconfig */; @@ -8070,20 +7857,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = ReleaseAppStore; }; - D00859BE1B28189D00EAF753 /* Build configuration list for PBXNativeTarget "Telegram-iOSTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D00859BF1B28189D00EAF753 /* DebugHockeyapp */, - D021D4E0219CB13A0064BEBA /* DebugFork */, - D079FCFB1F06BBA40038FADE /* DebugAppStore */, - D0ADF917212B3A9E00310BBC /* DebugAppStoreLLC */, - D00859C01B28189D00EAF753 /* ReleaseAppStore */, - D0CE6F0F213DC33200BCD44B /* ReleaseAppStoreLLC */, - D0924FFB1FE52C46003F693F /* ReleaseHockeyappInternal */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = ReleaseAppStore; - }; D02CF610215D9ABF00E0F56A /* Build configuration list for PBXNativeTarget "NotificationContent" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/submodules/Display b/submodules/Display index 8fbc832d3a..6ae1baad94 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 8fbc832d3aeaa4e2bf31105b166ee212968ba632 +Subproject commit 6ae1baad940abd703ccf37505c2270a8cd4fbfc6 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 78bc2e6cc3..5a84384da7 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 78bc2e6cc30f1c1161e13cceb2934d056060425b +Subproject commit 5a84384da7a3f7ff06183d6acc8c970996e7383e diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 6b8adfc5b0..031ff5fa80 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 6b8adfc5b0ff2f74b94a7da6fb73f76be3c27e44 +Subproject commit 031ff5fa80e802cd6e14d7bd10eaccfb4ce09315