GitLab

at 2023-05-10T20:12:53+02:00

change: OMEMO: Add device id and namespace to OMEMOBundle

         if not items:

             yield task.set_result(None)

 

-        yield _parse_bundle(items[0])

+        yield _parse_bundle(items[0], device_id)

 

 

 def _parse_omemo_message(stanza):

     return OMEMOMessage(sid=sid, iv=iv, keys=keys, payload=payload)

 

 

-def _parse_bundle(item):

+def _parse_bundle(item, device_id):

     '''

     <item id='current'>

       <bundle xmlns='eu.siacs.conversations.axolotl'>

 

         result['otpks'].append({'key': key, 'id': id_})

 

-    return OMEMOBundle(**result)

+    return OMEMOBundle(**result,

+                       device_id=device_id,

+                       namespace=Namespace.OMEMO_TEMP)

 

 

 def _make_bundle(bundle):

     spk_signature: bytes

     ik: bytes

     otpks: list[dict[str, str]]

+    device_id: int = -1

+    namespace: str = Namespace.OMEMO_TEMP

 

     def pick_prekey(self) -> dict[str, str]:

         return random.SystemRandom().choice(self.otpks)

Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits:

2 changed files:

Changes: