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
9eb2654c
Commit
9eb2654c
authored
Sep 07, 2022
by
Tijmen de Mes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed decrypting messages after key import
parent
7cb50745
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
messages.py
blink/messages.py
+3
-2
message.py
blink/streams/message.py
+1
-1
No files found.
blink/messages.py
View file @
9eb2654c
...
@@ -813,8 +813,9 @@ class MessageManager(object, metaclass=Singleton):
...
@@ -813,8 +813,9 @@ class MessageManager(object, metaclass=Singleton):
request
.
account
.
save
()
request
.
account
.
save
()
for
session
in
[
session
for
session
in
self
.
sessions
if
session
.
account
is
request
.
account
]:
for
session
in
[
session
for
session
in
self
.
sessions
if
session
.
account
is
request
.
account
]:
notification_center
=
NotificationCenter
()
stream
=
session
.
fake_streams
.
get
(
'messages'
)
notification_center
.
post_notification
(
'PGPKeysShouldReload'
,
sender
=
session
)
if
not
stream
.
can_encrypt
:
stream
.
enable_pgp
()
while
self
.
_incoming_encrypted_message_queue
:
while
self
.
_incoming_encrypted_message_queue
:
message
,
account
,
contact
=
self
.
_incoming_encrypted_message_queue
.
popleft
()
message
,
account
,
contact
=
self
.
_incoming_encrypted_message_queue
.
popleft
()
...
...
blink/streams/message.py
View file @
9eb2654c
...
@@ -257,7 +257,7 @@ class MessageStream(object, metaclass=MediaStreamType):
...
@@ -257,7 +257,7 @@ class MessageStream(object, metaclass=MediaStreamType):
if
self
.
private_key
is
None
:
if
self
.
private_key
is
None
:
self
.
private_key
=
self
.
_load_key
(
str
(
session
.
account
.
id
),
public_key
=
False
)
self
.
private_key
=
self
.
_load_key
(
str
(
session
.
account
.
id
),
public_key
=
False
)
if
None
not
in
[
self
.
remote_public_key
,
self
.
public_key
,
self
.
private_key
]:
if
None
not
in
[
self
.
public_key
,
self
.
private_key
]:
notification_center
=
NotificationCenter
()
notification_center
=
NotificationCenter
()
notification_center
.
post_notification
(
'MessageStreamPGPKeysDidLoad'
,
sender
=
self
)
notification_center
.
post_notification
(
'MessageStreamPGPKeysDidLoad'
,
sender
=
self
)
self
.
_load_other_keys
(
session
)
self
.
_load_other_keys
(
session
)
...
...
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