diff options
| author | fiaxh <git@lightrise.org> | 2020-06-10 23:40:00 +0200 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2020-06-10 23:40:00 +0200 |
| commit | 0beb592c5a6a2767e11a892bdb5ac9bcc5283c38 (patch) | |
| tree | bea2894d322472292590ec126dc1b52543a10a7e /plugins/omemo | |
| parent | 50c55c7f55aff6622d242bdcf2b58d5f7956f28e (diff) | |
| download | dino-0beb592c5a6a2767e11a892bdb5ac9bcc5283c38.tar.gz dino-0beb592c5a6a2767e11a892bdb5ac9bcc5283c38.zip | |
Use sqlite UPSERT
Diffstat (limited to 'plugins/omemo')
| -rw-r--r-- | plugins/omemo/src/logic/manager.vala | 4 | ||||
| -rw-r--r-- | plugins/omemo/src/logic/pre_key_store.vala | 6 | ||||
| -rw-r--r-- | plugins/omemo/src/logic/session_store.vala | 8 | ||||
| -rw-r--r-- | plugins/omemo/src/logic/signed_pre_key_store.vala | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/plugins/omemo/src/logic/manager.vala b/plugins/omemo/src/logic/manager.vala index 4bb85d59..e561bd90 100644 --- a/plugins/omemo/src/logic/manager.vala +++ b/plugins/omemo/src/logic/manager.vala @@ -352,8 +352,8 @@ public class Manager : StreamInteractionModule, Object { store.identity_key_store.identity_key_private = new Bytes(key_pair.private.serialize()); store.identity_key_store.identity_key_public = new Bytes(key_pair.public.serialize()); - identity_id = (int) db.identity.insert().or("REPLACE") - .value(db.identity.account_id, account.id) + identity_id = (int) db.identity.upsert() + .value(db.identity.account_id, account.id, true) .value(db.identity.device_id, (int) store.local_registration_id) .value(db.identity.identity_key_private_base64, Base64.encode(store.identity_key_store.identity_key_private.get_data())) .value(db.identity.identity_key_public_base64, Base64.encode(store.identity_key_store.identity_key_public.get_data())) diff --git a/plugins/omemo/src/logic/pre_key_store.vala b/plugins/omemo/src/logic/pre_key_store.vala index 716fd32f..27e5c01d 100644 --- a/plugins/omemo/src/logic/pre_key_store.vala +++ b/plugins/omemo/src/logic/pre_key_store.vala @@ -27,9 +27,9 @@ private class BackedPreKeyStore : SimplePreKeyStore { } public void on_pre_key_stored(PreKeyStore.Key key) { - db.pre_key.insert().or("REPLACE") - .value(db.pre_key.identity_id, identity_id) - .value(db.pre_key.pre_key_id, (int) key.key_id) + db.pre_key.upsert() + .value(db.pre_key.identity_id, identity_id, true) + .value(db.pre_key.pre_key_id, (int) key.key_id, true) .value(db.pre_key.record_base64, Base64.encode(key.record)) .perform(); } diff --git a/plugins/omemo/src/logic/session_store.vala b/plugins/omemo/src/logic/session_store.vala index 654591d1..2c7ef642 100644 --- a/plugins/omemo/src/logic/session_store.vala +++ b/plugins/omemo/src/logic/session_store.vala @@ -29,10 +29,10 @@ private class BackedSessionStore : SimpleSessionStore { } public void on_session_stored(SessionStore.Session session) { - db.session.insert().or("REPLACE") - .value(db.session.identity_id, identity_id) - .value(db.session.address_name, session.name) - .value(db.session.device_id, session.device_id) + db.session.upsert() + .value(db.session.identity_id, identity_id, true) + .value(db.session.address_name, session.name, true) + .value(db.session.device_id, session.device_id, true) .value(db.session.record_base64, Base64.encode(session.record)) .perform(); } diff --git a/plugins/omemo/src/logic/signed_pre_key_store.vala b/plugins/omemo/src/logic/signed_pre_key_store.vala index 8ff54a93..08f115c9 100644 --- a/plugins/omemo/src/logic/signed_pre_key_store.vala +++ b/plugins/omemo/src/logic/signed_pre_key_store.vala @@ -27,9 +27,9 @@ private class BackedSignedPreKeyStore : SimpleSignedPreKeyStore { } public void on_signed_pre_key_stored(SignedPreKeyStore.Key key) { - db.signed_pre_key.insert().or("REPLACE") - .value(db.signed_pre_key.identity_id, identity_id) - .value(db.signed_pre_key.signed_pre_key_id, (int) key.key_id) + db.signed_pre_key.upsert() + .value(db.signed_pre_key.identity_id, identity_id, true) + .value(db.signed_pre_key.signed_pre_key_id, (int) key.key_id, true) .value(db.signed_pre_key.record_base64, Base64.encode(key.record)) .perform(); } |