ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-31 15:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-10-26 14:58:02 +04:00
commit 9c0c99b65f
12 changed files with 125 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Random.txt
View File

@ -1 +1 @@
1c6f97bd3d230ccacfcdb9ff323624644fa53fc0ca4bbb6a5152826fa731a273
2bf91df86de591d993771f62fd05896852285001a5e720b8b04158a855350de3

2
Telegram/BUILD
View File

@ -372,7 +372,6 @@ plist_fragment(
official_apple_pay_merchants = [
"merchant.ph.telegra.Telegraph",
"merchant.yandex.ph.telegra.Telegraph",
"merchant.sberbank.ph.telegra.Telegraph",
"merchant.sberbank.test.ph.telegra.Telegraph",
"merchant.privatbank.test.telergramios",
@ -380,6 +379,7 @@ official_apple_pay_merchants = [
"merchant.paymaster.test.telegramios",
"merchant.smartglocal.prod.telegramios",
"merchant.smartglocal.test.telegramios",
"merchant.yoomoney.test.telegramios",
]
official_bundle_ids = [

62
Telegram/NotificationService/Sources/NotificationService.swift
View File

@ -598,17 +598,40 @@ private final class NotificationServiceHandler {
return nil
}
let _ = (self.accountManager.currentAccountRecord(allocateIfNotExists: false)
let _ = (self.accountManager.accountRecords()
|> take(1)
|> deliverOn(self.queue)).start(next: { [weak self] records in
guard let strongSelf = self, let record = records else {
var recordId: AccountRecordId?
var isCurrentAccount: Bool = false
if let keyId = notificationPayloadKeyId(data: payloadData) {
outer: for listRecord in records.records {
for attribute in listRecord.attributes {
if case let .backupData(backupData) = attribute {
if let notificationEncryptionKeyId = backupData.data?.notificationEncryptionKeyId {
if keyId == notificationEncryptionKeyId {
recordId = listRecord.id
isCurrentAccount = records.currentRecord?.id == listRecord.id
break outer
}
}
}
}
}
}
guard let strongSelf = self, let recordId = recordId else {
let content = NotificationContent()
updateCurrentContent(content)
completed()
return
}
let _ = (standaloneStateManager(
accountManager: strongSelf.accountManager,
networkArguments: networkArguments,
id: record.0,
id: recordId,
encryptionParameters: strongSelf.encryptionParameters,
rootPath: rootPath,
auxiliaryMethods: accountAuxiliaryMethods
@ -618,6 +641,8 @@ private final class NotificationServiceHandler {
return
}
guard let stateManager = stateManager else {
let content = NotificationContent()
updateCurrentContent(content)
completed()
return
}
@ -626,18 +651,31 @@ private final class NotificationServiceHandler {
strongSelf.notificationKeyDisposable.set((existingMasterNotificationsKey(postbox: stateManager.postbox)
|> deliverOn(strongSelf.queue)).start(next: { notificationsKey in
guard let strongSelf = self else {
let content = NotificationContent()
updateCurrentContent(content)
completed()
return
}
guard let notificationsKey = notificationsKey else {
let content = NotificationContent()
updateCurrentContent(content)
completed()
return
}
guard let decryptedPayload = decryptedNotificationPayload(key: notificationsKey, data: payloadData) else {
let content = NotificationContent()
updateCurrentContent(content)
completed()
return
}
guard let payloadJson = try? JSONSerialization.jsonObject(with: decryptedPayload, options: []) as? [String: Any] else {
let content = NotificationContent()
updateCurrentContent(content)
completed()
return
}
@ -663,6 +701,10 @@ private final class NotificationServiceHandler {
if let channelIdValue = Int64(channelIdString) {
peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt64Value(channelIdValue))
}
} else if let encryptionIdString = payloadJson["encryption_id"] as? String {
if let encryptionIdValue = Int64(encryptionIdString) {
peerId = PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt64Value(encryptionIdValue))
}
}
enum Action {
@ -735,7 +777,7 @@ private final class NotificationServiceHandler {
}
content.userInfo["peerId"] = "\(peerId.toInt64())"
content.userInfo["accountId"] = "\(record.0.int64)"
content.userInfo["accountId"] = "\(recordId.int64)"
if let silentString = payloadJson["silent"] as? String {
if let silentValue = Int(silentString), silentValue != 0 {
@ -888,7 +930,9 @@ private final class NotificationServiceHandler {
return
}
content.badge = Int(value.0)
if isCurrentAccount {
content.badge = Int(value.0)
}
if let image = mediaAttachment as? TelegramMediaImage, let resource = largestImageRepresentation(image.representations)?.resource {
if let mediaData = mediaData {
@ -1037,7 +1081,9 @@ private final class NotificationServiceHandler {
)
|> deliverOn(strongSelf.queue)).start(next: { value in
var content = NotificationContent()
content.badge = Int(value.0)
if isCurrentAccount {
content.badge = Int(value.0)
}
updateCurrentContent(content)
@ -1080,7 +1126,9 @@ private final class NotificationServiceHandler {
)
|> deliverOn(strongSelf.queue)).start(next: { value in
var content = NotificationContent()
content.badge = Int(value.0)
if isCurrentAccount {
content.badge = Int(value.0)
}
updateCurrentContent(content)

2
submodules/SparseItemGrid/Sources/SparseItemGridScrollingArea.swift
View File

@ -802,7 +802,7 @@ public final class SparseItemGridScrollingArea: ASDisplayNode {
let indicatorSize = self.dateIndicator.update(
transition: .immediate,
component: AnyComponent(SparseItemGridScrollingIndicatorComponent(
backgroundColor: theme.list.itemHighlightedBackgroundColor,
backgroundColor: theme.list.itemBlocksBackgroundColor,
shadowColor: .black,
foregroundColor: theme.list.itemPrimaryTextColor,
dateString: dateString

75
submodules/TelegramCore/Sources/Account/Account.swift
View File

@ -693,37 +693,49 @@ private func masterNotificationsKey(masterNotificationKeyValue: Atomic<MasterNot
if let key = masterNotificationKeyValue.with({ $0 }) {
return .single(key)
}
return postbox.transaction(ignoreDisabled: ignoreDisabled, { transaction -> MasterNotificationKey? in
if let value = transaction.keychainEntryForKey("master-notification-secret"), !value.isEmpty {
let authKeyHash = sha1Digest(value)
let authKeyId = authKeyHash.subdata(in: authKeyHash.count - 8 ..< authKeyHash.count)
let keyData = MasterNotificationKey(id: authKeyId, data: value)
let _ = masterNotificationKeyValue.swap(keyData)
return keyData
} else if createIfNotExists {
var secretData = Data(count: 256)
let secretDataCount = secretData.count
if !secretData.withUnsafeMutableBytes({ rawBytes -> Bool in
let bytes = rawBytes.baseAddress!.assumingMemoryBound(to: Int8.self)
let copyResult = SecRandomCopyBytes(nil, secretDataCount, bytes)
return copyResult == errSecSuccess
}) {
assertionFailure()
}
transaction.setKeychainEntry(secretData, forKey: "master-notification-secret")
let authKeyHash = sha1Digest(secretData)
let authKeyId = authKeyHash.subdata(in: authKeyHash.count - 8 ..< authKeyHash.count)
let keyData = MasterNotificationKey(id: authKeyId, data: secretData)
let _ = masterNotificationKeyValue.swap(keyData)
return keyData
} else {
return nil
}
let result = masterNotificationsKey(transaction: transaction, createIfNotExists: createIfNotExists)
let _ = masterNotificationKeyValue.swap(result)
return result
})
}
func masterNotificationsKey(transaction: Transaction, createIfNotExists: Bool) -> MasterNotificationKey? {
if let value = transaction.keychainEntryForKey("master-notification-secret"), !value.isEmpty {
let authKeyHash = sha1Digest(value)
let authKeyId = authKeyHash.subdata(in: authKeyHash.count - 8 ..< authKeyHash.count)
let keyData = MasterNotificationKey(id: authKeyId, data: value)
return keyData
} else if createIfNotExists {
var secretData = Data(count: 256)
let secretDataCount = secretData.count
if !secretData.withUnsafeMutableBytes({ rawBytes -> Bool in
let bytes = rawBytes.baseAddress!.assumingMemoryBound(to: Int8.self)
let copyResult = SecRandomCopyBytes(nil, secretDataCount, bytes)
return copyResult == errSecSuccess
}) {
assertionFailure()
}
transaction.setKeychainEntry(secretData, forKey: "master-notification-secret")
let authKeyHash = sha1Digest(secretData)
let authKeyId = authKeyHash.subdata(in: authKeyHash.count - 8 ..< authKeyHash.count)
let keyData = MasterNotificationKey(id: authKeyId, data: secretData)
return keyData
} else {
return nil
}
}
public func notificationPayloadKeyId(data: Data) -> Data? {
if data.count < 8 {
return nil
}
return data.subdata(in: 0 ..< 8)
}
public func decryptedNotificationPayload(key: MasterNotificationKey, data: Data) -> Data? {
if data.count < 8 {
return nil
@ -792,7 +804,14 @@ public func accountBackupData(postbox: Postbox) -> Signal<AccountBackupData?, No
guard let authKey = datacenterAuthInfo.authKey else {
return nil
}
return AccountBackupData(masterDatacenterId: state.masterDatacenterId, peerId: state.peerId.toInt64(), masterDatacenterKey: authKey, masterDatacenterKeyId: datacenterAuthInfo.authKeyId)
let notificationsKey = masterNotificationsKey(transaction: transaction, createIfNotExists: true)
return AccountBackupData(
masterDatacenterId: state.masterDatacenterId,
peerId: state.peerId.toInt64(),
masterDatacenterKey: authKey,
masterDatacenterKeyId: datacenterAuthInfo.authKeyId,
notificationEncryptionKeyId: notificationsKey?.id
)
}
}

10
submodules/TelegramCore/Sources/SyncCore/SyncCore_AccountBackupDataAttribute.swift
View File

@ -6,12 +6,20 @@ public struct AccountBackupData: Codable, Equatable {
public var peerId: Int64
public var masterDatacenterKey: Data
public var masterDatacenterKeyId: Int64
public var notificationEncryptionKeyId: Data?
public init(masterDatacenterId: Int32, peerId: Int64, masterDatacenterKey: Data, masterDatacenterKeyId: Int64) {
public init(
masterDatacenterId: Int32,
peerId: Int64,
masterDatacenterKey: Data,
masterDatacenterKeyId: Int64,
notificationEncryptionKeyId: Data?
) {
self.masterDatacenterId = masterDatacenterId
self.peerId = peerId
self.masterDatacenterKey = masterDatacenterKey
self.masterDatacenterKeyId = masterDatacenterKeyId
self.notificationEncryptionKeyId = notificationEncryptionKeyId
}
}

4
submodules/TelegramCore/Sources/TelegramEngine/Messages/SparseMessageList.swift
View File

@ -209,8 +209,8 @@ public final class SparseMessageList {
var removeIndices: [Int] = []
for i in 0 ..< sparseItems.items.count {
switch sparseItems.items[i] {
case let .anchor(id, _, message):
if message != nil, idsSet.contains(id) {
case let .anchor(id, _, _):
if idsSet.contains(id) {
removeIndices.append(i)
}
default:

2
submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
View File

@ -389,7 +389,7 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
controlColor: UIColor(rgb: 0x98989e)
),
mediaPlaceholderColor: UIColor(rgb: 0xffffff).mixedWith(UIColor(rgb: 0x1c1c1d), alpha: 0.9),
scrollIndicatorColor: UIColor(rgb: 0xffffff, alpha: 0.3),
scrollIndicatorColor: UIColor(rgb: 0xffffff, alpha: 0.5),
pageIndicatorInactiveColor: UIColor(white: 1.0, alpha: 0.3),
inputClearButtonColor: UIColor(rgb: 0x8b9197),
itemBarChart: PresentationThemeItemBarChart(color1: UIColor(rgb: 0xffffff), color2: UIColor(rgb: 0x929196), color3: UIColor(rgb: 0x333333)),

2
submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
View File

@ -644,7 +644,7 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
controlColor: mainSecondaryTextColor.withAlphaComponent(0.5)
),
mediaPlaceholderColor: UIColor(rgb: 0xffffff).mixedWith(mainBackgroundColor, alpha: 0.9),
scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3),
scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.5),
pageIndicatorInactiveColor: mainSecondaryTextColor.withAlphaComponent(0.4),
inputClearButtonColor: mainSecondaryColor,
itemBarChart: PresentationThemeItemBarChart(color1: accentColor, color2: mainSecondaryTextColor.withAlphaComponent(0.5), color3: accentColor.withMultiplied(hue: 1.038, saturation: 0.329, brightness: 0.33)),

4
submodules/TelegramUI/Sources/AppDelegate.swift
View File

@ -2277,6 +2277,8 @@ private func notificationPayloadKey(data: Data) -> Data? {
private func accountIdFromNotification(_ notification: UNNotification, sharedContext: Signal<SharedApplicationContext, NoError>) -> Signal<AccountRecordId?, NoError> {
if let id = notification.request.content.userInfo["accountId"] as? Int64 {
return .single(AccountRecordId(rawValue: id))
} else if let idString = notification.request.content.userInfo["accountId"] as? String, let id = Int64(idString) {
return .single(AccountRecordId(rawValue: id))
} else {
var encryptedData: Data?
if var encryptedPayload = notification.request.content.userInfo["p"] as? String {
@ -2336,6 +2338,8 @@ private func accountIdFromNotification(_ notification: UNNotification, sharedCon
private func peerIdFromNotification(_ notification: UNNotification) -> PeerId? {
if let peerId = notification.request.content.userInfo["peerId"] as? Int64 {
return PeerId(peerId)
} else if let peerIdString = notification.request.content.userInfo["peerId"] as? String, let peerId = Int64(peerIdString) {
return PeerId(peerId)
} else {
let payload = notification.request.content.userInfo
var peerId: PeerId?

2
submodules/TelegramUI/Sources/FetchManager.swift
View File

@ -101,6 +101,8 @@ private final class FetchManagerStatusContext {
return .Fetching(isActive: false, progress: 0.0)
} else if self.hasEntry {
return originalStatus
} else if case .Local = originalStatus {
return originalStatus
} else {
return .Remote
}

2
versions.json
View File

@ -1,5 +1,5 @@
{
"app": "8.1.2",
"app": "8.2",
"bazel": "4.0.0",
"xcode": "13.0"
}