ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-03 21:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter Iakovlev 2018-03-30 03:53:50 +04:00
parent efc5ff8e98
commit 4a2705d051
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TelegramCore/SecureFileMediaResource.swift
View File

@ -53,7 +53,7 @@ public class SecureFileMediaResource: TelegramCloudMediaResource, TelegramMultip
}
public required init(decoder: PostboxDecoder) {
self.file = SecureIdFileReference(id: decoder.decodeInt64ForKey("f", orElse: 0), accessHash: decoder.decodeInt64ForKey("a", orElse: 0), size: decoder.decodeInt32ForKey("n", orElse: 0), datacenterId: decoder.decodeInt32ForKey("d", orElse: 0), date: decoder.decodeInt32ForKey("t", orElse: 0), fileHash: decoder.decodeBytesForKey("h")?.makeData() ?? Data(), encryptedSecret: decoder.decodeBytesForKey("s")?.makeData() ?? Data())
self.file = SecureIdFileReference(id: decoder.decodeInt64ForKey("f", orElse: 0), accessHash: decoder.decodeInt64ForKey("a", orElse: 0), size: decoder.decodeInt32ForKey("n", orElse: 0), datacenterId: decoder.decodeInt32ForKey("d", orElse: 0), timestamp: decoder.decodeInt32ForKey("t", orElse: 0), fileHash: decoder.decodeBytesForKey("h")?.makeData() ?? Data(), encryptedSecret: decoder.decodeBytesForKey("s")?.makeData() ?? Data())
}
public func encode(_ encoder: PostboxEncoder) {
@ -61,7 +61,7 @@ public class SecureFileMediaResource: TelegramCloudMediaResource, TelegramMultip
encoder.encodeInt64(self.file.accessHash, forKey: "a")
encoder.encodeInt32(self.file.size, forKey: "n")
encoder.encodeInt32(self.file.datacenterId, forKey: "d")
encoder.encodeInt32(self.file.date, forKey: "t")
encoder.encodeInt32(self.file.timestamp, forKey: "t")
encoder.encodeBytes(MemoryBuffer(data: self.file.fileHash), forKey: "h")
encoder.encodeBytes(MemoryBuffer(data: self.file.encryptedSecret), forKey: "s")
}

6
TelegramCore/SecureIdDataTypes.swift
View File

@ -25,7 +25,7 @@ public struct SecureIdFileReference: Equatable {
let accessHash: Int64
let size: Int32
let datacenterId: Int32
let date: Int32
public let timestamp: Int32
let fileHash: Data
let encryptedSecret: Data
@ -42,7 +42,7 @@ public struct SecureIdFileReference: Equatable {
if lhs.datacenterId != rhs.datacenterId {
return false
}
if lhs.date != rhs.date {
if lhs.timestamp != rhs.timestamp {
return false
}
if lhs.fileHash != rhs.fileHash {
@ -59,7 +59,7 @@ extension SecureIdFileReference {
init?(apiFile: Api.SecureFile) {
switch apiFile {
case let .secureFile(id, accessHash, size, dcId, date, fileHash, secret):
self.init(id: id, accessHash: accessHash, size: size, datacenterId: dcId, date: date, fileHash: fileHash.makeData(), encryptedSecret: secret.makeData())
self.init(id: id, accessHash: accessHash, size: size, datacenterId: dcId, timestamp: date, fileHash: fileHash.makeData(), encryptedSecret: secret.makeData())
case .secureFileEmpty:
return nil
}