ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-15 21:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source 
# Conflicts:
#	NotificationContent/Info.plist
#	Share/Info.plist
#	SiriIntents/Info.plist
#	Telegram-iOS UITests/Info.plist
#	Telegram-iOS.xcodeproj/project.pbxproj
#	Telegram-iOS/Info.plist
#	Telegram-iOSTests/Info.plist
#	Watch/App/Info.plist
#	Watch/Extension/Info.plist
#	Widget/Info.plist
#	submodules/TelegramUI
This commit is contained in:
overtake 2018-11-20 19:13:35 +04:00
commit ad9b1ad126
12 changed files with 44 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NotificationContent/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

2
Share/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

31
Share/ShareItems.swift
View File

@ -330,34 +330,19 @@ func sentShareItems(account: Account, to peerIds: [PeerId], items: [PreparedShar
return enqueueMessagesToMultiplePeers(account: account, peerIds: peerIds, messages: messages)
|> introduceError(Void.self)
|> mapToSignal { messageIds -> Signal<Float, Void> in
var signals: [Signal<Bool, NoError>] = []
for messageId in messageIds {
signals.append(account.postbox.messageView(messageId)
|> map { view -> Bool in
if let message = view.message {
let key: PostboxViewKey = .messages(Set(messageIds))
return account.postbox.combinedView(keys: [key])
|> introduceError(Void.self)
|> mapToSignal { view -> Signal<Float, Void> in
if let messagesView = view.views[key] as? MessagesView {
for (_, message) in messagesView.messages {
if message.flags.contains(.Unsent) {
return false
return .complete()
}
}
return true
}
|> filter { $0 }
|> take(1))
}
return combineLatest(signals)
|> introduceError(Void.self)
|> map { flags -> Bool in
for flag in flags {
if !flag {
return false
}
}
return true
}
|> filter { $0 }
|> take(1)
|> mapToSignal { _ -> Signal<Float, Void> in
return .single(1.0)
}
|> take(1)
}
}

2
SiriIntents/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

2
Telegram-iOS UITests/Info.plist
View File

@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
</dict>
</plist>

48
Telegram-iOS.xcodeproj/project.pbxproj
View File

@ -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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
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 = 636;
CURRENT_PROJECT_VERSION = 640;
DEVELOPMENT_TEAM = X834Q8SBVP;
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (

2
Telegram-iOS/Info.plist
View File

@ -56,7 +56,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>

4
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -3522,5 +3522,7 @@ Unused sets are archived when you add more.";
"Login.CancelPhoneVerification" = "Do you want to stop the phone number verification process?";
"Login.CancelPhoneVerificationStop" = "Stop";
"Login.CancelPhoneVerificationContinue" = "Continue";
"Login.CodeExpired" = "Code expired, please login again.";
"Login.CancelSignUpConfirmation" = "Are you sure you want to cancel registration?";
"Passcode.AppLockedAlert" = "Telegram Locked";
"Passcode.AppLockedAlert" = "Telegram\nLocked";

2
Telegram-iOSTests/Info.plist
View File

@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
</dict>
</plist>

2
Watch/App/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>

2
Watch/Extension/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

2
Widget/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>636</string>
<string>640</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionMainStoryboard</key>