From 930db85f60354eaced5b500a96a22212dab474c6 Mon Sep 17 00:00:00 2001 From: overtake <> Date: Tue, 20 Nov 2018 19:12:18 +0400 Subject: [PATCH 1/2] notification exceptions --- NotificationContent/Info.plist | 2 +- Share/Info.plist | 2 +- SiriIntents/Info.plist | 2 +- Telegram-iOS UITests/Info.plist | 2 +- Telegram-iOS.xcodeproj/project.pbxproj | 48 +++++++++++------------ Telegram-iOS/Info.plist | 2 +- Telegram-iOS/en.lproj/Localizable.strings | 16 ++++++++ Telegram-iOSTests/Info.plist | 2 +- Watch/App/Info.plist | 2 +- Watch/Extension/Info.plist | 2 +- Widget/Info.plist | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 13 files changed, 51 insertions(+), 35 deletions(-) diff --git a/NotificationContent/Info.plist b/NotificationContent/Info.plist index 2954cf3717..5220564000 100644 --- a/NotificationContent/Info.plist +++ b/NotificationContent/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 635 + 636 NSExtension NSExtensionAttributes diff --git a/Share/Info.plist b/Share/Info.plist index 44a614be40..27d0aa2d4e 100644 --- a/Share/Info.plist +++ b/Share/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 635 + 636 NSExtension NSExtensionAttributes diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 682e894303..c08c0c59ca 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 635 + 636 NSExtension NSExtensionAttributes diff --git a/Telegram-iOS UITests/Info.plist b/Telegram-iOS UITests/Info.plist index f6021e6481..c98de714ab 100644 --- a/Telegram-iOS UITests/Info.plist +++ b/Telegram-iOS UITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 635 + 636 diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index 6f3f469bd0..af1f0255b1 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -4694,7 +4694,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4735,7 +4735,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP (6N38VWS5BX)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP (6N38VWS5BX)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4871,7 +4871,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Fork.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4936,7 +4936,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "Share/Share-Fork.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; @@ -4965,7 +4965,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Fork.entitlements"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -5855,7 +5855,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; @@ -5887,7 +5887,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -5917,7 +5917,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -5996,7 +5996,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6062,7 +6062,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = Share/Info.plist; @@ -6092,7 +6092,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -6163,7 +6163,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6226,7 +6226,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -6255,7 +6255,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -6333,7 +6333,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6399,7 +6399,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = Share/Info.plist; @@ -6430,7 +6430,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -6977,7 +6977,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -7041,7 +7041,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = C67CF9S4VU; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Share/Info.plist; @@ -7071,7 +7071,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7223,7 +7223,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -7252,7 +7252,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7280,7 +7280,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7350,7 +7350,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 635; + CURRENT_PROJECT_VERSION = 636; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index e16235568e..e2350365d9 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -56,7 +56,7 @@ CFBundleVersion - 635 + 636 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 92919e22fb..ad86cdfed8 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -372,6 +372,17 @@ "Notification.MessageLifetime1d" = "1 day"; "Notification.MessageLifetime1w" = "1 week"; +"Notification.Exceptions.AlwaysOn" = "Always On"; +"Notification.Exceptions.AlwaysOff" = "Always Off"; +"Notification.Exceptions.MutedUntil" = "Muted until %@"; + +"Notification.Exceptions.AddException" = "Add an Exception"; +"Notification.Exceptions.NewException" = "New Exception"; +"Notification.Exceptions.NewException.NotificationHeader" = "NOTIFICATIONS"; +"Notification.Exceptions.Sound" = "Sound: %@"; + + + // Message "Message.Photo" = "Photo"; "Message.Video" = "Video"; @@ -527,18 +538,23 @@ "Notifications.MessageNotificationsPreview" = "Message Preview"; "Notifications.MessageNotificationsSound" = "Sound"; "Notifications.MessageNotificationsHelp" = "You can set custom notifications for specific users on their Info page."; +"Notifications.MessageNotificationsExceptionsHelp" = "Set custom notifications for specific users."; + + "Notifications.GroupNotifications" = "GROUP NOTIFICATIONS"; "Notifications.GroupNotificationsAlert" = "Alert"; "Notifications.GroupNotificationsPreview" = "Message Preview"; "Notifications.GroupNotificationsSound" = "Sound"; "Notifications.GroupNotificationsHelp" = "You can set custom notifications for specific groups on the Group Info page."; +"Notifications.GroupNotificationsExceptionsHelp" = "Set custom notifications for specific groups."; "Notifications.ChannelNotifications" = "CHANNEL NOTIFICATIONS"; "Notifications.ChannelNotificationsAlert" = "Alert"; "Notifications.ChannelNotificationsPreview" = "Message Preview"; "Notifications.ChannelNotificationsSound" = "Sound"; "Notifications.ChannelNotificationsHelp" = "You can set custom notifications for specific channels on the Channel Info page."; +"Notifications.ChannelNotificationsExceptionsHelp" = "Set custom notifications for specific channels."; "Notifications.TextTone" = "Text Tone"; "Notifications.AlertTones" = "ALERT TONES"; diff --git a/Telegram-iOSTests/Info.plist b/Telegram-iOSTests/Info.plist index 8c062dfe47..1f75ab7ebb 100644 --- a/Telegram-iOSTests/Info.plist +++ b/Telegram-iOSTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 635 + 636 diff --git a/Watch/App/Info.plist b/Watch/App/Info.plist index 8a0ad83827..69f33bde48 100644 --- a/Watch/App/Info.plist +++ b/Watch/App/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 635 + 636 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Watch/Extension/Info.plist b/Watch/Extension/Info.plist index 00029769a5..1bd1b11948 100644 --- a/Watch/Extension/Info.plist +++ b/Watch/Extension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 635 + 636 NSExtension NSExtensionAttributes diff --git a/Widget/Info.plist b/Widget/Info.plist index 1681cfa976..2dcaac34d1 100644 --- a/Widget/Info.plist +++ b/Widget/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 635 + 636 NSExtension NSExtensionMainStoryboard diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 8c8dfb1056..f59b9e432e 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 8c8dfb1056d6d0cb95c80bb77d4a291910e07d27 +Subproject commit f59b9e432ec166833e065e8db26d0824aadc3f61 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 6d1c9a1ce3..6739d9360e 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 6d1c9a1ce3b0340997d70bf799d006db410cf24b +Subproject commit 6739d9360ec65943bef1be80b25ae74b468b8d33 From 6fa4d68fc46d59395d41b33fc768d49158589bf4 Mon Sep 17 00:00:00 2001 From: overtake <> Date: Tue, 20 Nov 2018 19:19:23 +0400 Subject: [PATCH 2/2] notification exceptions --- NotificationContent/Info.plist | 2 +- Share/Info.plist | 2 +- SiriIntents/Info.plist | 2 +- Telegram-iOS UITests/Info.plist | 2 +- Telegram-iOS.xcodeproj/project.pbxproj | 48 +++++++++++++------------- Telegram-iOS/Info.plist | 2 +- Telegram-iOSTests/Info.plist | 2 +- Watch/App/Info.plist | 2 +- Watch/Extension/Info.plist | 2 +- Widget/Info.plist | 2 +- submodules/TelegramUI | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/NotificationContent/Info.plist b/NotificationContent/Info.plist index ba11ba3f46..a64ee2a4b9 100644 --- a/NotificationContent/Info.plist +++ b/NotificationContent/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 640 + 641 NSExtension NSExtensionAttributes diff --git a/Share/Info.plist b/Share/Info.plist index 420a2958ca..0101884ba7 100644 --- a/Share/Info.plist +++ b/Share/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 640 + 641 NSExtension NSExtensionAttributes diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 95d456db05..a1934fd577 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 640 + 641 NSExtension NSExtensionAttributes diff --git a/Telegram-iOS UITests/Info.plist b/Telegram-iOS UITests/Info.plist index 50bb55ecef..99cecb8135 100644 --- a/Telegram-iOS UITests/Info.plist +++ b/Telegram-iOS UITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 640 + 641 diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index ff9712f90c..68b8c46517 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -4694,7 +4694,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4735,7 +4735,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP (6N38VWS5BX)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP (6N38VWS5BX)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4871,7 +4871,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Fork.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4936,7 +4936,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "Share/Share-Fork.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; @@ -4965,7 +4965,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Fork.entitlements"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -5855,7 +5855,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; @@ -5887,7 +5887,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -5917,7 +5917,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -5996,7 +5996,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6062,7 +6062,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = Share/Info.plist; @@ -6092,7 +6092,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -6163,7 +6163,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6226,7 +6226,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -6255,7 +6255,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -6333,7 +6333,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6399,7 +6399,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = Share/Info.plist; @@ -6430,7 +6430,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -6977,7 +6977,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -7041,7 +7041,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = C67CF9S4VU; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Share/Info.plist; @@ -7071,7 +7071,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7223,7 +7223,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -7252,7 +7252,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7280,7 +7280,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7350,7 +7350,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 640; + CURRENT_PROJECT_VERSION = 641; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index f8cf90142e..1097b226e5 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -56,7 +56,7 @@ CFBundleVersion - 640 + 641 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/Telegram-iOSTests/Info.plist b/Telegram-iOSTests/Info.plist index 9562a82464..5eb06735fa 100644 --- a/Telegram-iOSTests/Info.plist +++ b/Telegram-iOSTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 640 + 641 diff --git a/Watch/App/Info.plist b/Watch/App/Info.plist index b32bab6cac..bef194471c 100644 --- a/Watch/App/Info.plist +++ b/Watch/App/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 640 + 641 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Watch/Extension/Info.plist b/Watch/Extension/Info.plist index 293c4f8efa..62553625af 100644 --- a/Watch/Extension/Info.plist +++ b/Watch/Extension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 640 + 641 NSExtension NSExtensionAttributes diff --git a/Widget/Info.plist b/Widget/Info.plist index a62de1ebd0..4f9c69bace 100644 --- a/Widget/Info.plist +++ b/Widget/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 640 + 641 NSExtension NSExtensionMainStoryboard diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 6739d9360e..133e60fd66 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 6739d9360ec65943bef1be80b25ae74b468b8d33 +Subproject commit 133e60fd66b969a259327b21a501a496aeff9a19