Merge branch 'develop' into travis/permalink-routing

Author: turt2live

package.json

@@ -57,6 +57,7 @@
     "bluebird": "^3.5.0",
     "browser-request": "^0.3.3",
     "content-type": "^1.0.2",
+    "loglevel": "1.6.1",
     "memfs": "^2.10.1",
     "request": "^2.88.0"
   },
@@ -74,7 +75,6 @@
     "expect": "^1.20.2",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.5.5",
-    "loglevel": "1.6.1",
     "lolex": "^1.5.2",
     "matrix-mock-request": "^1.2.2",
     "mocha": "^5.2.0",

spec/unit/crypto/DeviceList.spec.js

@@ -59,24 +59,35 @@ describe('DeviceList', function() {
     let downloadSpy;
     let sessionStore;
     let cryptoStore;
+    let deviceLists = [];
 
     beforeEach(function() {
         testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
 
+        deviceLists = [];
+
         downloadSpy = expect.createSpy();
         const mockStorage = new MockStorageApi();
         sessionStore = new WebStorageSessionStore(mockStorage);
         cryptoStore = new MemoryCryptoStore();
     });
 
+    afterEach(function() {
+        for (const dl of deviceLists) {
+            dl.stop();
+        }
+    });
+
     function createTestDeviceList() {
         const baseApis = {
             downloadKeysForUsers: downloadSpy,
         };
         const mockOlm = {
             verifySignature: function(key, message, signature) {},
         };
-        return new DeviceList(baseApis, cryptoStore, sessionStore, mockOlm);
+        const dl = new DeviceList(baseApis, cryptoStore, sessionStore, mockOlm);
+        deviceLists.push(dl);
+        return dl;
     }
 
     it("should successfully download and store device keys", function() {

src/crypto/DeviceList.js

@@ -146,6 +146,12 @@ export default class DeviceList {
         }
     }
 
+    stop() {
+        if (this._saveTimer !== null) {
+            clearTimeout(this._saveTimer);
+        }
+    }
+
     /**
      * Save the device tracking state to storage, if any changes are
      * pending other than updating the sync token

src/crypto/index.js

@@ -221,6 +221,7 @@ Crypto.prototype.start = function() {
 /** Stop background processes related to crypto */
 Crypto.prototype.stop = function() {
     this._outgoingRoomKeyRequestManager.stop();
+    this._deviceList.stop();
 };
 
 /**