Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send msg: try claiming keys and sharing session

Browse Source 
The sharing will fail for now, until device verification is implemented.
This commit is contained in:
miruka 2019-05-08 12:12:43 -04:00
parent ca04e4c4a4
commit a672b725de
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
harmonyqml/backend/client.py
View File

@ -1,6 +1,7 @@
# Copyright 2019 miruka # Copyright 2019 miruka
# This file is part of harmonyqml, licensed under GPLv3. # This file is part of harmonyqml, licensed under GPLv3.
import logging as log
import time import time
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from threading import Event from threading import Event
@ -84,11 +85,24 @@ class Client(QObject):
self.net.talk(self.nio.keys_upload) self.net.talk(self.nio.keys_upload)
@futurize(max_running=1, discard_if_max_running=True, pyqt=False)
def _keys_query(self) -> None: def _keys_query(self) -> None:
self.net.talk(self.nio.keys_query) self.net.talk(self.nio.keys_query)
def _keys_claim(self, room_id: str) -> None:
self.net.talk(self.nio.keys_claim, room_id)
def _share_group_session(self,
room_id: str,
ignore_missing_sessions: bool = False) -> None:
self.net.talk(
self.nio.share_group_session,
room_id = room_id,
ignore_missing_sessions = ignore_missing_sessions,
)
@pyqtSlot(str, result="QVariant") @pyqtSlot(str, result="QVariant")
@pyqtSlot(str, str, result="QVariant") @pyqtSlot(str, str, result="QVariant")
@futurize() @futurize()
@ -253,13 +267,29 @@ class Client(QObject):
# sent at a time is one per room at a time. # sent at a time is one per room at a time.
@futurize(max_running=1, consider_args=True) @futurize(max_running=1, consider_args=True)
def send(self, room_id: str) -> PyQtFuture: def send(self, room_id: str) -> PyQtFuture:
return self.net.talk( talk = lambda: self.net.talk(
self.nio.room_send, self.nio.room_send,
room_id = room_id, room_id = room_id,
message_type = "m.room.message", message_type = "m.room.message",
content = content, content = content,
) )
try:
log.debug("Try sending message %r to %r", content, room_id)
return talk()
except nio.GroupEncryptionError as err:
log.warning(err)
try:
self._share_group_session(room_id)
except nio.EncryptionError as err:
log.warning(err)
self._keys_claim(room_id)
self._share_group_session(room_id,
ignore_missing_sessions=True)
log.debug("Final try to send %r to %r", content, room_id)
return talk()
return send(self, room_id) return send(self, room_id)