refactorng
This commit is contained in:
parent
00af582287
commit
75554c7451
30 changed files with 515 additions and 627 deletions
|
@ -54,22 +54,20 @@ QXmppTask<QXmppOmemoStorage::OmemoData> Core::OmemoHandler::allData() {
|
|||
OmemoData data;
|
||||
data.ownDevice = ownDevice;
|
||||
|
||||
// LMDBAL::Transaction txn = db.beginReadOnlyTransaction(); TODO need to enable transaction after fixing LMDBAL
|
||||
std::map<uint32_t, QByteArray> pkeys = preKeyPairs->readAll();
|
||||
for (const std::pair<const uint32_t, QByteArray>& pair : pkeys) {
|
||||
LMDBAL::Transaction txn = db.beginReadOnlyTransaction();
|
||||
std::map<uint32_t, QByteArray> pkeys = preKeyPairs->readAll(txn);
|
||||
for (const std::pair<const uint32_t, QByteArray>& pair : pkeys)
|
||||
data.preKeyPairs.insert(pair.first, pair.second);
|
||||
}
|
||||
|
||||
std::map<uint32_t, SignedPreKeyPair> spre = signedPreKeyPairs->readAll();
|
||||
std::map<uint32_t, SignedPreKeyPair> spre = signedPreKeyPairs->readAll(txn);
|
||||
for (const std::pair<const uint32_t, SignedPreKeyPair>& pair : spre) {
|
||||
QXmppOmemoStorage::SignedPreKeyPair qxpair = {pair.second.first, pair.second.second};
|
||||
data.signedPreKeyPairs.insert(pair.first, qxpair);
|
||||
}
|
||||
|
||||
std::map<QString, QHash<uint32_t, Device>> devs = devices->readAll();
|
||||
for (const std::pair<const QString, QHash<uint32_t, Device>>& pair : devs) {
|
||||
std::map<QString, QHash<uint32_t, Device>> devs = devices->readAll(txn);
|
||||
for (const std::pair<const QString, QHash<uint32_t, Device>>& pair : devs)
|
||||
data.devices.insert(pair.first, pair.second);
|
||||
}
|
||||
|
||||
return Core::makeReadyTask(std::move(data));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue