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
6dfa6434
Commit
6dfa6434
authored
Sep 14, 2016
by
Mark Haines
Browse files
Fix the group javascript demo
parent
f274adfe
Changes
1
Hide whitespace changes
Inline
Side-by-side
javascript/demo/group_demo.js
View file @
6dfa6434
...
...
@@ -261,7 +261,7 @@ DemoUser.prototype.receiveOneToOne = function(jsonpacket) {
if
(
!
self
.
peerGroupSessions
[
sender
]
||
!
self
.
peerGroupSessions
[
sender
][
body
.
session_id
])
{
self
.
createInboundSession
(
sender
,
body
.
session_id
,
body
.
message_index
,
body
.
session_key
sender
,
body
.
session_id
,
body
.
session_key
);
}
});
...
...
@@ -337,15 +337,18 @@ DemoUser.prototype.getGroupSession = function() {
* add a task to create an inbound group session
*/
DemoUser
.
prototype
.
createInboundSession
=
function
(
peer_id
,
session_id
,
message_index
,
session_key
,
callback
peer_id
,
session_id
,
session_key
,
callback
)
{
var
self
=
this
;
this
.
addTask
(
"
init inbound session
"
,
function
(
done
)
{
session
=
new
Olm
.
InboundGroupSession
();
session
.
create
(
message_index
,
session_key
);
session
.
create
(
session_key
);
if
(
!
self
.
peerGroupSessions
[
peer_id
])
{
self
.
peerGroupSessions
[
peer_id
]
=
{};
}
if
(
session_id
!=
session
.
session_id
())
{
throw
new
Error
(
"
Mismatched session_ids
"
);
}
self
.
peerGroupSessions
[
peer_id
][
session_id
]
=
session
;
done
(
session
);
},
callback
);
...
...
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