diff --git a/NotificationContent/Info.plist b/NotificationContent/Info.plist index 04c3b10904..540ef74cfa 100644 --- a/NotificationContent/Info.plist +++ b/NotificationContent/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/Share/Info.plist b/Share/Info.plist index d6bceae984..fa3457e3dd 100644 --- a/Share/Info.plist +++ b/Share/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 9ab4c5b45c..40358bebac 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index f122a6c249..da8c66d127 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -2711,8 +2711,7 @@ }; D0ECCB7B1FE9C38500609802 = { CreatedOnToolsVersion = 9.2; - DevelopmentTeam = X834Q8SBVP; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; TestTargetID = D008599B1B28189D00EAF753; }; }; @@ -5054,10 +5053,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -5082,6 +5081,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -6548,10 +6548,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -6576,6 +6576,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -7199,10 +7200,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7220,6 +7221,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; @@ -7519,10 +7521,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7547,6 +7549,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -7587,10 +7590,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7615,6 +7618,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -7655,10 +7659,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7676,6 +7680,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; @@ -7716,10 +7721,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7737,6 +7742,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; @@ -7777,10 +7783,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = X834Q8SBVP; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7798,6 +7804,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.Telegram.Telegram-iOS-UITests"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "df24dc18-3fdc-447c-b347-5a110cecd77d"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index f939498d27..a61b50c801 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -375,6 +375,25 @@ private enum QueuedWakeup: Int32 { let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil) Logger.setSharedLogger(Logger(basePath: logsPath)) + if let contents = try? FileManager.default.contentsOfDirectory(at: URL(fileURLWithPath: rootPath + "/accounts-metadata"), includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants]) { + for url in contents { + Logger.shared.log("App \(self.episodeId)", "metadata: \(url.path)") + } + } + + if let contents = try? FileManager.default.contentsOfDirectory(at: URL(fileURLWithPath: rootPath), includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants]) { + for url in contents { + Logger.shared.log("App \(self.episodeId)", "root: \(url.path)") + if url.lastPathComponent.hasPrefix("account-") { + if let subcontents = try? FileManager.default.contentsOfDirectory(at: url, includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants]) { + for suburl in subcontents { + Logger.shared.log("App \(self.episodeId)", "account \(url.lastPathComponent): \(suburl.path)") + } + } + } + } + } + ASDisableLogging() initializeLegacyComponents(application: application, currentSizeClassGetter: { @@ -400,6 +419,8 @@ private enum QueuedWakeup: Int32 { #else if BuildConfig.shared().isInternalBuild { LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true) + } else { + LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true) } #endif diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index 8297abfc9a..5082769bee 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 20ba2ca475..71bcb595a5 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -2621,15 +2621,19 @@ Unused sets are archived when you add more."; "Conversation.RestrictedTextTimed" = "The admins of this group have restricted you from writing here until %@."; "Conversation.RestrictedText" = "The admins of this group have restricted you from writing here."; +"Conversation.DefaultRestrictedText" = "Writing is restricted in this group."; "Conversation.RestrictedInlineTimed" = "The admins of this group have restricted you from posting inline content here until %@."; "Conversation.RestrictedInline" = "The admins of this group have restricted you from posting inline content here."; +"Conversation.DefaultRestrictedInline" = "Inline content is disabled in this group."; "Conversation.RestrictedMediaTimed" = "The admins of this group have restricted you from posting media content here until %@."; "Conversation.RestrictedMedia" = "The admins of this group have restricted you from posting media content here."; +"Conversation.DefaultRestrictedMedia" = "Posting media content is disabled in this group."; "Conversation.RestrictedStickersTimed" = "The admins of this group have restricted you from posting stickers here until %@."; "Conversation.RestrictedStickers" = "The admins of this group have restricted you from posting stickers here."; +"Conversation.DefaultRestrictedStickers" = "Posting stickers is disabled in this group."; "ChatSettings.ConnectionType.Title" = "CONNECTION TYPE"; "ChatSettings.ConnectionType.UseProxy" = "Use Proxy"; @@ -3834,3 +3838,8 @@ Unused sets are archived when you add more."; "EmptyGroupInfo.Line2" = "Persistent chat history"; "EmptyGroupInfo.Line3" = "Public links such as t.me/title"; "EmptyGroupInfo.Line4" = "Admins with different rights"; + +"BackgroundPreview.Title" = "Background Preview"; + +"Group.AdvanceUpgradeText" = "To use advanced group management options this group will be upgraded to a supergroup."; +"Group.AdvanceUpgradeApply" = "Upgrade"; diff --git a/Watch/App/Info.plist b/Watch/App/Info.plist index 32f5069708..7b24e407cf 100644 --- a/Watch/App/Info.plist +++ b/Watch/App/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleVersion ${BUILD_NUMBER} UISupportedInterfaceOrientations diff --git a/Watch/Extension/Info.plist b/Watch/Extension/Info.plist index f103ec4414..f187ca639e 100644 --- a/Watch/Extension/Info.plist +++ b/Watch/Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/Widget/Info.plist b/Widget/Info.plist index 512f87e95c..8d87b04066 100644 --- a/Widget/Info.plist +++ b/Widget/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.1.1 + 5.2 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/submodules/Display b/submodules/Display index 839a447700..c91d10ec4b 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 839a4477001317e42c083afda63ab898354f72ac +Subproject commit c91d10ec4b27b5242ff4683481279095d705a5c7 diff --git a/submodules/Postbox b/submodules/Postbox index 3f244f8f4f..7a701322ae 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 3f244f8f4f41819edb8cc43013eea2328c8f7aa1 +Subproject commit 7a701322aee430bc93b3c88e1deaec69ea762abf diff --git a/submodules/TelegramCore b/submodules/TelegramCore index e89f808e42..da68a6d0db 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit e89f808e42b12026b0456630a322238ab63529ad +Subproject commit da68a6d0db2a38797b83af854b883c7ccf9bc172 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 65c57fad4a..d81b5b8950 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 65c57fad4a3eadb56582537ee6f175dceb884554 +Subproject commit d81b5b89504c4729dc4b9c5827973cff615d1424