v0.7.5

s/flushNewDeviceRequests/refreshOutdatedDeviceLists/ - this got fixed on one PR
and apparenlty I failed to merge the changes correctly

CHANGELOG.md

@@ -1,20 +1,18 @@
-Changes in [0.7.5-rc.2](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.7.5-rc.2) (2017-02-03)
+Changes in [0.7.5](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.7.5) (2017-02-04)
+================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.7.5-rc.3...v0.7.5)
+
+No changes from 0.7.5-rc.3
+
+Changes in [0.7.5-rc.3](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.7.5-rc.3) (2017-02-03)
 ==========================================================================================================
-[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.7.5-rc.1...v0.7.5-rc.2)
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.7.5-rc.2...v0.7.5-rc.3)
 
- * Use the device change notifications interface
-   [\#348](https://github.com/matrix-org/matrix-js-sdk/pull/348)
- * Rewrite the device key query logic
-   [\#347](https://github.com/matrix-org/matrix-js-sdk/pull/347)
+ * Include DeviceInfo in deviceVerificationChanged events
+   [a3cc8eb](https://github.com/matrix-org/matrix-js-sdk/commit/a3cc8eb1f6d165576a342596f638316721cb26b6)
+ * Fix device list update
+   [5fd7410](https://github.com/matrix-org/matrix-js-sdk/commit/5fd74109ffc56b73deb40c2604d84c38b8032c40)
 
-Changes in [0.7.5-rc.2](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.7.5-rc.2) (2017-02-03)
-==========================================================================================================
-[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v0.7.5-rc.1...v0.7.5-rc.2)
-
- * Use the device change notifications interface
-   [\#348](https://github.com/matrix-org/matrix-js-sdk/pull/348)
- * Rewrite the device key query logic
-   [\#347](https://github.com/matrix-org/matrix-js-sdk/pull/347)
 
 Changes in [0.7.5-rc.2](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v0.7.5-rc.2) (2017-02-03)
 ==========================================================================================================

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-js-sdk",
-  "version": "0.7.5-rc.2",
+  "version": "0.7.5",
   "description": "Matrix Client-Server SDK for Javascript",
   "main": "index.js",
   "scripts": {

src/client.js

@@ -418,8 +418,10 @@ function _setDeviceVerification(client, userId, deviceId, verified, blocked, kno
     if (!client._crypto) {
         throw new Error("End-to-End encryption disabled");
     }
-    client._crypto.setDeviceVerification(userId, deviceId, verified, blocked, known);
-    client.emit("deviceVerificationChanged", userId, deviceId);
+    const dev = client._crypto.setDeviceVerification(
+        userId, deviceId, verified, blocked, known,
+    );
+    client.emit("deviceVerificationChanged", userId, deviceId, dev);
 }
 
 /**
@@ -3163,6 +3165,7 @@ module.exports.CRYPTO_ENABLED = CRYPTO_ENABLED;
  * @event module:client~MatrixClient#"deviceVerificationChanged"
  * @param {string} userId the owner of the verified device
  * @param {string} deviceId the id of the verified device
+ * @param {module:crypto/deviceinfo} deviceInfo updated device information
  */
 
 /**

src/crypto/index.js

@@ -386,6 +386,8 @@ Crypto.prototype.listDeviceKeys = function(userId) {
  *
  * @param {?boolean} known whether to mark that the user has been made aware of
  *      the existence of this device. Null to leave unchanged
+ *
+ * @return {module:crypto/deviceinfo} updated DeviceInfo
  */
 Crypto.prototype.setDeviceVerification = function(userId, deviceId, verified,
                                                   blocked, known) {
@@ -414,12 +416,12 @@ Crypto.prototype.setDeviceVerification = function(userId, deviceId, verified,
         knownStatus = known;
     }
 
-    if (dev.verified === verificationStatus && dev.known === knownStatus) {
-        return;
+    if (dev.verified !== verificationStatus || dev.known !== knownStatus) {
+        dev.verified = verificationStatus;
+        dev.known = knownStatus;
+        this._sessionStore.storeEndToEndDevicesForUser(userId, devices);
     }
-    dev.verified = verificationStatus;
-    dev.known = knownStatus;
-    this._sessionStore.storeEndToEndDevicesForUser(userId, devices);
+    return DeviceInfo.fromStorage(dev, deviceId);
 };
 
 
@@ -762,7 +764,7 @@ Crypto.prototype._onSyncCompleted = function(syncData) {
                 // if that failed, we fall back to invalidating everyone.
                 console.warn("Error fetching changed device list", e);
                 this._invalidateDeviceListForAllActiveUsers();
-                return this._deviceList.flushNewDeviceRequests();
+                return this._deviceList.refreshOutdatedDeviceLists();
             }).done();
         } else {
             // otherwise, we have to invalidate all devices for all users we
@@ -851,7 +853,7 @@ Crypto.prototype._invalidateDeviceListsSince = function(oldSyncToken) {
                 this._deviceList.invalidateUserDeviceList(u);
             }
         });
-        return this._deviceList.flushNewDeviceRequests();
+        return this._deviceList.refreshOutdatedDeviceLists();
     });
 };