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

This commit is contained in:
Ilya Laktyushin
2020-06-24 18:06:15 +03:00
95 changed files with 6089 additions and 4686 deletions

View File

@@ -508,13 +508,17 @@ public class LocalFileMediaResource: TelegramMediaResource {
public let fileId: Int64
public let size: Int?
public init(fileId: Int64, size: Int? = nil) {
public let isSecretRelated: Bool
public init(fileId: Int64, size: Int? = nil, isSecretRelated: Bool = false) {
self.fileId = fileId
self.size = size
self.isSecretRelated = isSecretRelated
}
public required init(decoder: PostboxDecoder) {
self.fileId = decoder.decodeInt64ForKey("f", orElse: 0)
self.isSecretRelated = decoder.decodeBoolForKey("sr", orElse: false)
if let size = decoder.decodeOptionalInt32ForKey("s") {
self.size = Int(size)
} else {
@@ -524,6 +528,7 @@ public class LocalFileMediaResource: TelegramMediaResource {
public func encode(_ encoder: PostboxEncoder) {
encoder.encodeInt64(self.fileId, forKey: "f")
encoder.encodeBool(self.isSecretRelated, forKey: "sr")
if let size = self.size {
encoder.encodeInt32(Int32(size), forKey: "s")
} else {
@@ -537,7 +542,7 @@ public class LocalFileMediaResource: TelegramMediaResource {
public func isEqual(to: MediaResource) -> Bool {
if let to = to as? LocalFileMediaResource {
return self.fileId == to.fileId && self.size == to.size
return self.fileId == to.fileId && self.size == to.size && self.isSecretRelated == to.isSecretRelated
} else {
return false
}