v2.4.2

Prepare changelog for v2.4.2
v2.4.2-rc.1
2019-10-18 14:36:57 +01:00 · 2019-10-18 14:36:57 +01:00 · 2019-10-09 16:49:43 +01:00 · 2019-10-09 16:49:42 +01:00 · 2019-10-09 15:48:54 +01:00 · 2019-10-09 15:41:34 +01:00
6 changed files with 39 additions and 7 deletions
@@ -1,3 +1,18 @@
+Changes in [2.4.2](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v2.4.2) (2019-10-18)
+================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v2.4.2-rc.1...v2.4.2)
+
+ * No changes since v2.4.2-rc.1
+
+Changes in [2.4.2-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v2.4.2-rc.1) (2019-10-09)
+==========================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v2.4.1...v2.4.2-rc.1)
+
+ * Log state of Olm sessions
+   [\#1047](https://github.com/matrix-org/matrix-js-sdk/pull/1047)
+ * Add method to get access to all timelines
+   [\#1048](https://github.com/matrix-org/matrix-js-sdk/pull/1048)
+
 Changes in [2.4.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v2.4.1) (2019-10-01)
 ================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v2.4.0...v2.4.1)
@@ -322,13 +322,13 @@ To provide the Olm library in a browser application:
 
 To provide the Olm library in a node.js application:

- * ``yarn add https://packages.matrix.org/npm/olm/olm-3.0.0.tgz``
+ * ``yarn add https://packages.matrix.org/npm/olm/olm-3.1.4.tgz``
   (replace the URL with the latest version you want to use from
    https://packages.matrix.org/npm/olm/)
 * ``global.Olm = require('olm');`` *before* loading ``matrix-js-sdk``.

 If you want to package Olm as dependency for your node.js application, you can
-use ``yarn add https://packages.matrix.org/npm/olm/olm-3.0.0.tgz``. If your
+use ``yarn add https://packages.matrix.org/npm/olm/olm-3.1.4.tgz``. If your
 application also works without e2e crypto enabled, add ``--optional`` to mark it
 as an optional dependency.

@@ -1,6 +1,6 @@
 {
  "name": "matrix-js-sdk",
-  "version": "2.4.1",
+  "version": "2.4.2",
  "description": "Matrix Client-Server SDK for Javascript",
  "main": "index.js",
  "scripts": {
@@ -83,7 +83,7 @@
    "matrix-mock-request": "^1.2.3",
    "mocha": "^5.2.0",
    "mocha-jenkins-reporter": "^0.4.0",
-    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
    "rimraf": "^2.5.4",
    "source-map-support": "^0.4.11",
    "sourceify": "^0.1.0",
@@ -594,6 +594,11 @@ OlmDevice.prototype.encryptMessage = async function(
        'readwrite', [IndexedDBCryptoStore.STORE_SESSIONS],
        (txn) => {
            this._getSession(theirDeviceIdentityKey, sessionId, txn, (sessionInfo) => {
+                const sessionDesc = sessionInfo.session.describe();
+                console.log(
+                    "Session ID " + sessionId + " to " +
+                    theirDeviceIdentityKey + ": " + sessionDesc,
+                );
                res = sessionInfo.session.encrypt(payloadString);
                this._saveSession(theirDeviceIdentityKey, sessionInfo, txn);
            });
@@ -621,6 +626,11 @@ OlmDevice.prototype.decryptMessage = async function(
        'readwrite', [IndexedDBCryptoStore.STORE_SESSIONS],
        (txn) => {
            this._getSession(theirDeviceIdentityKey, sessionId, txn, (sessionInfo) => {
+                const sessionDesc = sessionInfo.session.describe();
+                console.log(
+                    "Session ID " + sessionId + " to " +
+                    theirDeviceIdentityKey + ": " + sessionDesc,
+                );
                payloadString = sessionInfo.session.decrypt(messageType, ciphertext);
                sessionInfo.lastReceivedMessageTs = Date.now();
                this._saveSession(theirDeviceIdentityKey, sessionInfo, txn);
@@ -92,6 +92,13 @@ function EventTimelineSet(room, opts) {
 }
 utils.inherits(EventTimelineSet, EventEmitter);

+/**
+ * Get all the timelines in this set
+ * @return {module:models/event-timeline~EventTimeline[]} the timelines in this set
+ */
+EventTimelineSet.prototype.getTimelines = function() {
+    return this._timelines;
+};
 /**
 * Get the filter object this timeline set is filtered on, if any
 * @return {?Filter} the optional filter for this timelineSet
@@ -3530,9 +3530,9 @@ object.pick@^1.3.0:
  dependencies:
    isobject "^3.0.1"

-"olm@https://packages.matrix.org/npm/olm/olm-3.1.0.tgz":
-  version "3.1.0"
-  resolved "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz#2c8fc2a42b7ea12febc31baa73ec03d9b601da16"
+"olm@https://packages.matrix.org/npm/olm/olm-3.1.4.tgz":
+  version "3.1.4"
+  resolved "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz#0f03128b7d3b2f614d2216409a1dfccca765fdb3"

 once@1.x, once@^1.3.0:
  version "1.4.0"
Author	SHA1	Message	Date
RiotRobot	c874783742	v2.4.2	2019-10-18 14:36:57 +01:00
RiotRobot	bb296f50d9	Prepare changelog for v2.4.2	2019-10-18 14:36:57 +01:00
RiotRobot	20d82eb92f	v2.4.2-rc.1	2019-10-09 16:49:43 +01:00
RiotRobot	319e1d1191	Prepare changelog for v2.4.2-rc.1	2019-10-09 16:49:42 +01:00
David Baker	107c8c0b1f	Merge pull request #1047 from matrix-org/dbkr/olm_session_describe Log state of Olm sessions	2019-10-09 15:48:54 +01:00
David Baker	8c6d9586bf	Update docs to reflect minimum olm version	2019-10-09 15:41:34 +01:00
David Baker	1271fc6bf3	Actually bump olm	2019-10-09 15:38:47 +01:00
David Baker	c9df03c40c	Bump to olm 3.1.4 which has olm_session_describe	2019-10-09 10:19:13 +01:00
Bruno Windels	27f6745123	Merge pull request #1048 from matrix-org/bwindels/redact-all-more-robust Add method to get access to all timelines	2019-10-08 06:58:13 +00:00
Bruno Windels	964f448334	moar doc fix	2019-10-02 15:30:28 +02:00
Bruno Windels	20ee03bb44	fix docs	2019-10-02 15:25:19 +02:00
Bruno Windels	77bd677182	add method to get access to all timelines	2019-10-02 10:00:11 +02:00
David Baker	e6699c5424	Log state of Olm sessions ...whenever we encrypt or decrypt a message on them. This adds another line of logging for every device in the room, so will be reasonably verbose if you're in large encrypted rooms, but the information ought to be valuable. Requires https://gitlab.matrix.org/matrix-org/olm/merge_requests/9 Don't merge before a new version of Olm is released with this merge request (it won't work).	2019-10-01 11:19:52 +01:00