narayana/another.im-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

mv-experiment #1

Merged
fmodf merged 88 commits from mv-experiment into develop 2024-09-03 15:13:59 +00:00
Conversation 0 Commits 88 Files changed 131 +15 -10
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c140133141 - Show all commits

23
ConversationsClassic/AppData/Client/Client+MartinOMEMO.swift
View file

@ -171,17 +171,22 @@ extension ClientMartinOMEMO: SignalIdentityKeyStoreProtocol {
return nil return nil
} }
// guard do {
// let data = try! Database.main.reader({ database in let record = try Database.shared.dbQueue.read { db in
// try database.select(query: .omemoKeyPairForAccount, params: ["account": account, "name": account.stringValue, "deviceId": deviceId]).mapFirst { $0.data(for: "key") } try OMEMOIdentity
// }) .filter(Column("account") == credentials.bareJid)
// else { .filter(Column("name") == credentials.bareJid)
// return nil .filter(Column("deviceId") == deviceId)
// } .fetchOne(db)
// }
// return SignalIdentityKeyPair(fromKeyPairData: data) guard let key = record?.key else {
return nil return nil
} }
return SignalIdentityKeyPair(fromKeyPairData: key)
} catch {
return nil
}
}
func localRegistrationId() -> UInt32 { func localRegistrationId() -> UInt32 {
if let settings = Settings.getFor(credentials.bareJid) { if let settings = Settings.getFor(credentials.bareJid) {