Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
b411f07d
Commit
b411f07d
authored
Sep 22, 2016
by
Richard van der Hoff
Browse files
InboundGroupSession.init no longer requires a separate message_index
parent
cfcee54a
Changes
1
Hide whitespace changes
Inline
Side-by-side
python/olm/__main__.py
View file @
b411f07d
...
...
@@ -314,13 +314,13 @@ def do_inbound_group(args):
))
sys
.
exit
(
1
)
credentials
=
json
.
load
(
args
.
credentials_file
)
for
k
in
(
'message_index'
,
'session_key'
):
for
k
in
(
'session_key'
,
):
if
not
k
in
credentials
:
sys
.
stderr
.
write
(
"Credentials file is missing %s
\n
"
%
k
)
sys
.
exit
(
1
);
session
=
InboundGroupSession
()
session
.
init
(
credentials
[
'message_index'
],
credentials
[
'session_key'
])
session
.
init
(
credentials
[
'session_key'
])
with
open
(
args
.
session_file
,
"wb"
)
as
f
:
f
.
write
(
session
.
pickle
(
args
.
key
))
...
...
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