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

Commits: ae4c98cb by Malte Leip at 2019-03-20T19:50:49Z Show trust level for incoming encrypted messages

- - - - -

2 changed files:

- gajim/common/const.py - gajim/conversation_textview.py

Changes:

===================================== gajim/common/const.py ===================================== @@ -199,6 +199,12 @@ class MUCUser(IntEnum): AFFILIATION = 3 AFFILIATION_TEXT = 4

+@unique +class Trust(IntEnum): + UNTRUSTED = 0 + UNDECIDED = 1 + BLIND = 2 + VERIFIED = 3

EME_MESSAGES = { 'urn:xmpp:otr:0':

===================================== gajim/conversation_textview.py ===================================== @@ -44,7 +44,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock -from gajim.common.const import StyleAttr +from gajim.common.const import StyleAttr, Trust

from gajim.gtk import util from gajim.gtk.util import load_icon @@ -60,6 +60,22 @@ SHOWN = 2

log = logging.getLogger('gajim.conversation_textview')

+TRUST_SYMBOL_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Trust Not Decided'), + 'warning-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Unverified'), + 'success-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color') +} + + def is_selection_modified(mark): name = mark.get_name() return name in ('selection_bound', 'insert') @@ -1133,13 +1149,17 @@ class ConversationTextview(GObject.GObject): color = 'unencrypted-color' tooltip = _('Not encrypted') else: - icon = 'channel-secure-symbolic' - color = 'encrypted-color' - name, fingerprint = details - if fingerprint is None: - tooltip = name + name, fingerprint, trust = details + tooltip = _('Encrypted (%s)') % (name) + if trust is None: + # The encryption plugin did not pass trust information + icon = 'channel-secure-symbolic' + color = 'encrypted-color' else: - tooltip = '%s %s' % (name, fingerprint) + icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] + tooltip = tooltip + '\n' + trust_tooltip + if fingerprint is not None: + tooltip = tooltip + ' (' + fingerprint + ')'

temp_mark = self._buffer.create_mark(None, iter_, True) self._buffer.insert(iter_, ' ') @@ -1164,7 +1184,8 @@ class ConversationTextview(GObject.GObject): return

fingerprint = additional_data.get_value('encrypted', 'fingerprint') - return name, fingerprint + trust = additional_data.get_value('encrypted', 'trust') + return name, fingerprint, trust

def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): local_tim = time.localtime(tim)

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ae4c98cbb2d187bb846fadce9584c1499a7...