aboutsummaryrefslogtreecommitdiff
path: root/javascript
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-09 15:37:56 +0000
committerHubert Chathi <hubert@uhoreg.ca>2019-10-09 15:37:56 +0000
commit387deeea8f66c93d84083790fd7b90bee0007ef9 (patch)
treec5dc092e5bb83b5a17863992396f0b82158c1e43 /javascript
parent3568060570bb06eff022f49ab39cf34e387e382f (diff)
parentfc423fad15ee3daaf236f211d67a25d03f63b560 (diff)
Merge branch 'dbkr/olm_session_describe' into 'master'
Add olm_session_describe See merge request matrix-org/olm!9
Diffstat (limited to 'javascript')
-rw-r--r--javascript/olm_post.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/javascript/olm_post.js b/javascript/olm_post.js
index ad058d9..e204f30 100644
--- a/javascript/olm_post.js
+++ b/javascript/olm_post.js
@@ -459,6 +459,19 @@ Session.prototype['decrypt'] = restore_stack(function(
});
+Session.prototype['describe'] = restore_stack(function() {
+ var description_buf;
+ try {
+ description_buf = malloc(256);
+ session_method(Module['_olm_session_describe'])(
+ this.ptr, description_buf, 256
+ );
+ return UTF8ToString(description_buf);
+ } finally {
+ if (description_buf !== undefined) free(description_buf);
+ }
+});
+
function Utility() {
var size = Module['_olm_utility_size']();
this.buf = malloc(size);