diff --git a/TelegramCore/SecureFileMediaResource.swift b/TelegramCore/SecureFileMediaResource.swift index 1f2bfa4b5b..eca19cb806 100644 --- a/TelegramCore/SecureFileMediaResource.swift +++ b/TelegramCore/SecureFileMediaResource.swift @@ -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") } diff --git a/TelegramCore/SecureIdDataTypes.swift b/TelegramCore/SecureIdDataTypes.swift index 5eb66a3c2d..2c6a717aa9 100644 --- a/TelegramCore/SecureIdDataTypes.swift +++ b/TelegramCore/SecureIdDataTypes.swift @@ -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 }