Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vmj-qt
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
vmj-qt
Commits
d1297740
Commit
d1297740
authored
Aug 17, 2022
by
Tijmen de Mes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed handling/displaying encrypted messages when no key is present
parent
47a848fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
11 deletions
+8
-11
chatwindow.py
blink/chatwindow.py
+1
-1
messages.py
blink/messages.py
+7
-10
No files found.
blink/chatwindow.py
View file @
d1297740
...
...
@@ -2379,7 +2379,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
else
:
sender
=
ChatSender
(
message
.
sender
.
display_name
or
session
.
name
,
uri
,
session
.
icon
.
filename
)
if
session
.
chat_widget
.
history_loaded
:
if
message
in
self
.
pending_decryption
:
if
message
in
self
.
pending_decryption
and
not
encrypted
:
self
.
pending_decryption
.
remove
(
message
)
session
.
chat_widget
.
update_message_text
(
message
.
id
,
content
)
else
:
...
...
blink/messages.py
View file @
d1297740
...
...
@@ -701,16 +701,13 @@ class MessageManager(object, metaclass=Singleton):
encryption
=
self
.
check_encryption
(
content_type
,
body
)
if
encryption
==
'OpenPGP'
:
if
account
.
sms
.
enable_pgp
and
(
account
.
sms
.
private_key
is
None
or
not
os
.
path
.
exists
(
account
.
sms
.
private_key
.
normalized
)):
for
request
in
self
.
pgp_requests
[
account
,
GeneratePGPKeyRequest
]:
return
generate_dialog
=
GeneratePGPKeyDialog
()
generate_request
=
GeneratePGPKeyRequest
(
generate_dialog
,
account
,
0
)
generate_request
.
accepted
.
connect
(
self
.
_SH_GeneratePGPKeys
)
generate_request
.
finished
.
connect
(
self
.
_SH_PGPRequestFinished
)
bisect
.
insort_right
(
self
.
pgp_requests
,
generate_request
)
generate_request
.
dialog
.
show
()
if
not
self
.
pgp_requests
[
account
,
GeneratePGPKeyRequest
]:
generate_dialog
=
GeneratePGPKeyDialog
()
generate_request
=
GeneratePGPKeyRequest
(
generate_dialog
,
account
,
0
)
generate_request
.
accepted
.
connect
(
self
.
_SH_GeneratePGPKeys
)
generate_request
.
finished
.
connect
(
self
.
_SH_PGPRequestFinished
)
bisect
.
insort_right
(
self
.
pgp_requests
,
generate_request
)
generate_request
.
dialog
.
show
()
elif
not
account
.
sms
.
enable_pgp
:
return
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment