Philipp Hörist pushed to branch omemo_integration at gajim / gajim
Commits:
08853f51 by Philipp Hörist at 2022-10-20T19:19:03+02:00
refactor: Move omemo storage to storage module
- - - - -
2 changed files:
- gajim/common/modules/omemobackend/state.py
- gajim/common/modules/omemobackend/liteaxolotlstore.py →
gajim/common/storage/omemo.py
Changes:
=====================================
gajim/common/modules/omemobackend/state.py
=====================================
@@ -40,13 +40,13 @@
from axolotl.duplicatemessagexception import DuplicateMessageException
from gajim.common import types
+from gajim.common.storage.omemo import OMEMOStorage
from gajim.common.modules.omemobackend.aes import aes_decrypt
from gajim.common.modules.omemobackend.aes import aes_encrypt
from gajim.common.modules.omemobackend.aes import get_new_key
from gajim.common.modules.omemobackend.aes import get_new_iv
from gajim.common.modules.omemobackend.devices import DeviceManager
from gajim.common.modules.omemobackend.devices import NoDevicesFound
-from gajim.common.modules.omemobackend.liteaxolotlstore import LiteAxolotlStore
from gajim.common.modules.omemobackend.util import get_fingerprint
from gajim.common.modules.omemobackend.util import Trust
from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT
@@ -69,7 +69,7 @@ def __init__(self,
self._log = xmpp_con._log
self._session_ciphers: dict[
str, dict[int, SessionCipher]] = defaultdict(dict)
- self._storage = LiteAxolotlStore(account, db_path, self._log)
+ self._storage = OMEMOStorage(account, db_path, self._log)
DeviceManager.__init__(self)
@@ -108,7 +108,7 @@ def build_session(self,
self._get_session_cipher(jid, device_id)
@property
- def storage(self) -> LiteAxolotlStore:
+ def storage(self) -> OMEMOStorage:
return self._storage
@property
=====================================
gajim/common/modules/omemobackend/liteaxolotlstore.py →
gajim/common/storage/omemo.py
=====================================
@@ -63,7 +63,7 @@ def _convert_record(record: bytes) -> SessionRecord:
sqlite3.register_converter('session_record', _convert_record)
-class LiteAxolotlStore(AxolotlStore):
+class OMEMOStorage(AxolotlStore):
def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None:
self._log = log
self._account = account
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/08853f51b32b4936a71096d0954f7a97efde4b74
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/08853f51b32b4936a71096d0954f7a97efde4b74
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
