ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-04 05:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/peter-iakovlev/postbox

Browse Source
This commit is contained in:
overtake 2019-05-21 18:09:03 +02:00
commit eb59174efa
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Postbox/AccountManagerAtomicState.swift
View File

@ -1,6 +1,6 @@
import Foundation import Foundation
struct AccountManagerAtomicState: Codable { final class AccountManagerAtomicState: Codable {
var records: [AccountRecordId: AccountRecord] var records: [AccountRecordId: AccountRecord]
var currentRecordId: AccountRecordId? var currentRecordId: AccountRecordId?
var currentAuthRecord: AuthAccountRecord? var currentAuthRecord: AuthAccountRecord?

4
Postbox/AccountRecord.swift
View File

@ -1,6 +1,6 @@
import Foundation import Foundation
public protocol AccountRecordAttribute: PostboxCoding { public protocol AccountRecordAttribute: class, PostboxCoding {
func isEqual(to: AccountRecordAttribute) -> Bool func isEqual(to: AccountRecordAttribute) -> Bool
} }
@ -34,7 +34,7 @@ public func generateAccountRecordId() -> AccountRecordId {
return AccountRecordId(rawValue: id) return AccountRecordId(rawValue: id)
} }
public struct AccountRecord: PostboxCoding, Equatable, Codable { public final class AccountRecord: PostboxCoding, Equatable, Codable {
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case id case id
case attributes case attributes

4
Postbox/MessageHistoryTable.swift
View File

@ -873,7 +873,9 @@ final class MessageHistoryTable: Table {
if let lower = lower, let upper = upper, let groupInfo = lower.groupInfo, lower.groupingKey == upper.groupingKey { if let lower = lower, let upper = upper, let groupInfo = lower.groupInfo, lower.groupingKey == upper.groupingKey {
assert(upper.groupInfo != nil) assert(upper.groupInfo != nil)
if lower.groupInfo != upper.groupInfo { if lower.groupInfo != upper.groupInfo {
self.updateSameGroupInfosInNamespace(lowerBound: index, from: upper.groupInfo!, to: groupInfo, updatedGroupInfos: &updatedGroupInfos) if let upperGroupInfo = upper.groupInfo {
self.updateSameGroupInfosInNamespace(lowerBound: index, from: groupInfo, to: upperGroupInfo, updatedGroupInfos: &updatedGroupInfos)
}
} }
} }
} }

2
Postbox/SqliteValueBox.swift
View File

@ -442,7 +442,7 @@ public final class SqliteValueBox: ValueBox {
private func beginInternal(database: Database) { private func beginInternal(database: Database) {
precondition(self.queue.isCurrent()) precondition(self.queue.isCurrent())
let resultCode = database.execute("BEGIN IMMEDIATE") let resultCode = database.execute("BEGIN IMMEDIATE")
precondition(resultCode) assert(resultCode)
} }
private func commitInternal(database: Database) { private func commitInternal(database: Database) {