Philipp Hörist pushed to branch storage at gajim / gajim


Commits:
7b43d095 by Philipp Hörist at 2023-06-22T00:02:56+02:00
Fix encryption

- - - - -


3 changed files:

- gajim/common/modules/message.py
- gajim/common/storage/archive2/statements.py
- gajim/gtk/conversation/rows/message.py


Changes:

=====================================
gajim/common/modules/message.py
=====================================
@@ -400,7 +400,7 @@ def log_message(self, message: OutgoingMessage) -> int | 
None:
             encryption_data = DbInsertEncryptionRowData(
                 protocol=enc_data['name'],
                 trust=enc_data['trust'],
-                key=enc_data.get('fingerprint'),
+                key='Unknown',
             )
             encryption_ek = app.storage.archive.insert_row(
                 encryption_data, raise_on_conflict=False)


=====================================
gajim/common/storage/archive2/statements.py
=====================================
@@ -329,6 +329,7 @@
     'message',
     'user_delay_ts',
     'fk_securitylabel_ek',
+    'fk_encryption_ek',
 )
 
 CALLS_COLUMNS = (
@@ -418,6 +419,7 @@
     'fk_occupant_ek',
     'corrected_message_id',
     'corrected_message',
+    'fk_encryption_ek',
 )
 
 MARKER_COLUMNS = (


=====================================
gajim/gtk/conversation/rows/message.py
=====================================
@@ -352,7 +352,7 @@ def _get_encryption_data(self,
             icon, trust_tooltip, color = TRUST_SYMBOL_DATA[
                 Trust(encryption_data.trust)]
             tooltip = f'{tooltip}\n{trust_tooltip}'
-            if encryption_data.key is not None:
+            if encryption_data.key is not None and not 'Unknown':
                 fingerprint = format_fingerprint(encryption_data.key)
                 tooltip = f'{tooltip}\n<tt>{fingerprint}</tt>'
 



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/7b43d095ee32c27dc46cd710884e0d0b121b5a08

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/7b43d095ee32c27dc46cd710884e0d0b121b5a08
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to