mv-experiment #1

Merged
fmodf merged 88 commits from mv-experiment into develop 2024-09-03 15:13:59 +00:00
Showing only changes of commit c140133141 - Show all commits

View file

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