From 6c4ad49b78426d227cd988bdd1ed6fcb023ca704 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 31 Aug 2016 21:50:46 +0100
Subject: [PATCH 01/26] use a top-level audio tag for playing all VoIP
 audio.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and
 https://github.com/vector-im/vector-web/issues/621

---
 src/components/views/voip/CallView.js  | 3 +--
 src/components/views/voip/VideoView.js | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index cc5289e7f1..4651e53551 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -79,8 +79,7 @@ module.exports = React.createClass({
         if (call) {
             call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
             call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());
-            // give a separate element for audio stream playback - both for voice calls
-            // and for the voice stream of screen captures
+            // always use a separate element for audio stream playback
             call.setRemoteAudioElement(this.getVideoView().getRemoteAudioElement());
         }
         if (call && call.type === "video" && call.call_state !== "ended" && call.call_state !== "ringing") {
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 46c5b354f8..487fd9f6ac 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -50,7 +50,10 @@ module.exports = React.createClass({
     },
 
     getRemoteAudioElement: function() {
-        return this.refs.remoteAudio;
+        // this needs to be somewhere at the top of the DOM which
+        // always exists to avoid audio interruptions.
+        // Might as well just use DOM.
+        return document.getElementById("remoteAudio");
     },
 
     getLocalVideoElement: function() {
@@ -106,7 +109,6 @@ module.exports = React.createClass({
                 <div className="mx_VideoView_remoteVideoFeed">
                     <VideoFeed ref="remote" onResize={this.props.onResize}
                         maxHeight={maxVideoHeight} />
-                    <audio ref="remoteAudio"/>
                 </div>
                 <div className="mx_VideoView_localVideoFeed">                
                     <VideoFeed ref="local"/>

From 4829ac0c4d1c83d9d69a228c4f8cc693c74338e1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 11:07:46 +0100
Subject: [PATCH 02/26] comment

---
 src/components/views/voip/CallView.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 4651e53551..e3894e0249 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -79,7 +79,10 @@ module.exports = React.createClass({
         if (call) {
             call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
             call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());
-            // always use a separate element for audio stream playback
+            // always use a separate element for audio stream playback.
+            // this is to let us move CallView around the DOM without interrupting remote audio
+            // during playback, by having the audio rendered by a top-level <audio/> element.
+            // rather than being rendered by the main remoteVideo <video/> element.
             call.setRemoteAudioElement(this.getVideoView().getRemoteAudioElement());
         }
         if (call && call.type === "video" && call.call_state !== "ended" && call.call_state !== "ringing") {

From ba341c11fbd1bee5d2fe86dfa38a30927531af14 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 1 Sep 2016 11:08:40 +0100
Subject: [PATCH 03/26] Show session restore errors on the login screen

If we are unable to load the matrix session on startup, don't just get stuck at
a spinner; instead, show the error on the login screen.
---
 src/components/structures/MatrixChat.js  | 37 ++++++++++++++++++------
 src/components/structures/login/Login.js | 11 ++++---
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 84575b9e4f..b82ef2d1a3 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -13,6 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
+import q from 'q';
+
 var React = require('react');
 var Matrix = require("matrix-js-sdk");
 var Favico = require('favico.js');
@@ -164,6 +167,9 @@ module.exports = React.createClass({
         // their mind & log back in)
         this.guestCreds = null;
 
+        // if the automatic session load failed, the error
+        this.sessionLoadError = null;
+
         if (this.props.config.sync_timeline_limit) {
             MatrixClientPeg.opts.initialSyncLimit = this.props.config.sync_timeline_limit;
         }
@@ -191,13 +197,18 @@ module.exports = React.createClass({
         window.addEventListener('resize', this.handleResize);
         this.handleResize();
 
-        Lifecycle.loadSession({
-            realQueryParams: this.props.realQueryParams,
-            fragmentQueryParams: this.props.startingFragmentQueryParams,
-            enableGuest: this.props.enableGuest,
-            guestHsUrl: this.getCurrentHsUrl(),
-            guestIsUrl: this.getCurrentIsUrl(),
-            defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
+        q().then(() => {
+            return Lifecycle.loadSession({
+                realQueryParams: this.props.realQueryParams,
+                fragmentQueryParams: this.props.startingFragmentQueryParams,
+                enableGuest: this.props.enableGuest,
+                guestHsUrl: this.getCurrentHsUrl(),
+                guestIsUrl: this.getCurrentIsUrl(),
+                defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
+            });
+        }).catch((e) => {
+            console.error("Unable to load session", e);
+            this.sessionLoadError = e.message;
         }).done(()=>{
             // stuff this through the dispatcher so that it happens
             // after the on_logged_in action.
@@ -1085,7 +1096,7 @@ module.exports = React.createClass({
                     onLoginClick={this.onLoginClick} />
             );
         } else {
-            return (
+            var r = (
                 <Login
                     onLoggedIn={Lifecycle.setLoggedIn}
                     onRegisterClick={this.onRegisterClick}
@@ -1098,8 +1109,16 @@ module.exports = React.createClass({
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     enableGuest={this.props.enableGuest}
                     onCancelClick={this.guestCreds ? this.onReturnToGuestClick : null}
-                    />
+                    initialErrorText={this.sessionLoadError}
+                />
             );
+
+            // we only want to show the session load error the first time the
+            // Login component is rendered. This is pretty hacky but I can't
+            // think of another way to achieve it.
+            this.sessionLoadError = null;
+
+            return r;
         }
     }
 });
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 8025504857..0315a3186a 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -52,12 +52,14 @@ module.exports = React.createClass({
         // login shouldn't care how password recovery is done.
         onForgotPasswordClick: React.PropTypes.func,
         onCancelClick: React.PropTypes.func,
+
+        initialErrorText: React.PropTypes.string,
     },
 
     getInitialState: function() {
         return {
             busy: false,
-            errorText: null,
+            errorText: this.props.initialErrorText,
             loginIncorrect: false,
             enteredHomeserverUrl: this.props.customHsUrl || this.props.defaultHsUrl,
             enteredIdentityServerUrl: this.props.customIsUrl || this.props.defaultIsUrl,
@@ -116,7 +118,8 @@ module.exports = React.createClass({
     onHsUrlChanged: function(newHsUrl) {
         var self = this;
         this.setState({
-            enteredHomeserverUrl: newHsUrl
+            enteredHomeserverUrl: newHsUrl,
+            errorText: null, // reset err messages
         }, function() {
             self._initLoginLogic(newHsUrl);
         });
@@ -125,7 +128,8 @@ module.exports = React.createClass({
     onIsUrlChanged: function(newIsUrl) {
         var self = this;
         this.setState({
-            enteredIdentityServerUrl: newIsUrl
+            enteredIdentityServerUrl: newIsUrl,
+            errorText: null, // reset err messages
         }, function() {
             self._initLoginLogic(null, newIsUrl);
         });
@@ -160,7 +164,6 @@ module.exports = React.createClass({
             enteredHomeserverUrl: hsUrl,
             enteredIdentityServerUrl: isUrl,
             busy: true,
-            errorText: null, // reset err messages
             loginIncorrect: false,
         });
     },

From f0d5f429215d5983c9de23ae75f9437f2211bef7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 13:58:26 +0100
Subject: [PATCH 04/26] whine loudly if remoteAudio element is missing

---
 src/components/views/voip/VideoView.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 487fd9f6ac..d018a2603c 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -53,7 +53,11 @@ module.exports = React.createClass({
         // this needs to be somewhere at the top of the DOM which
         // always exists to avoid audio interruptions.
         // Might as well just use DOM.
-        return document.getElementById("remoteAudio");
+        var remoteAudioElement = document.getElementById("remoteAudio");
+        if (!remoteAudioElement) {
+            console.error("Failed to find remoteAudio element - cannot play audio!  You need to add an <audio/> to the DOM.");
+        }
+        return remoteAudioElement;
     },
 
     getLocalVideoElement: function() {

From 1bc26cb6c53f0d996fa798d426eee6e4f046d6da Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 16:58:18 +0100
Subject: [PATCH 05/26] fix guest access; broken since Aug 18

---
 src/RoomNotifs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 00cad23791..d0cdd6ead7 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -24,7 +24,7 @@ export const MENTIONS_ONLY = 'mentions_only';
 export const MUTE = 'mute';
 
 export function getRoomNotifsState(roomId) {
-    if (MatrixClientPeg.get().isGuest()) return RoomNotifs.ALL_MESSAGES;
+    if (MatrixClientPeg.get().isGuest()) return ALL_MESSAGES;
 
     // look through the override rules for a rule affecting this room:
     // if one exists, it will take precedence.

From 1586e5bd6f1c39544de11c9c5e2fd296cb09864e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 16:58:18 +0100
Subject: [PATCH 06/26] fix guest access; broken since Aug 18

---
 src/RoomNotifs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 00cad23791..d0cdd6ead7 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -24,7 +24,7 @@ export const MENTIONS_ONLY = 'mentions_only';
 export const MUTE = 'mute';
 
 export function getRoomNotifsState(roomId) {
-    if (MatrixClientPeg.get().isGuest()) return RoomNotifs.ALL_MESSAGES;
+    if (MatrixClientPeg.get().isGuest()) return ALL_MESSAGES;
 
     // look through the override rules for a rule affecting this room:
     // if one exists, it will take precedence.

From 57ba49d896b8300c6b20badd7401da72272a8127 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 22:18:10 +0100
Subject: [PATCH 07/26] Prepare changelog for v0.6.5-r1

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c18ffa24d7..03096b04b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.6.5-r1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r1) (2016-09-01)
+=========================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5...v0.6.5-r1)
+
+ * Fix guest access
+
 Changes in [0.6.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5) (2016-08-28)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.4-r1...v0.6.5)

From b9d98f918e243f27d3f36e2e1a00ac16a0e1a344 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 22:18:11 +0100
Subject: [PATCH 08/26] 0.6.5-r1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 569ce798f8..c154f7bc88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.6.5",
+  "version": "0.6.5-r1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From b4521bc44c67b5e524346340be659b9a7f755a21 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Thu, 1 Sep 2016 22:45:09 +0100
Subject: [PATCH 09/26] review feedback

---
 src/components/structures/MatrixChat.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b82ef2d1a3..e1e622af65 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -197,6 +197,8 @@ module.exports = React.createClass({
         window.addEventListener('resize', this.handleResize);
         this.handleResize();
 
+        // the extra q() ensures that synchronous exceptions hit the same codepath as
+        // asynchronous ones.
         q().then(() => {
             return Lifecycle.loadSession({
                 realQueryParams: this.props.realQueryParams,

From f3a1c58fa9dcde17c9bbf68d7ac8b628896e1275 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 2 Sep 2016 11:25:10 +0100
Subject: [PATCH 10/26] Handle broken OlmAccounts

olm 1.0.0 made broken OlmAccounts, which we may be unable to restore with olm
1.1.0. Add some words to that effect, and make sure we clear the localstorage.
---
 src/Lifecycle.js | 63 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index ee82a8890a..442a5beec3 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -197,15 +197,31 @@ function _restoreFromLocalStorage() {
 
     if (access_token && user_id && hs_url) {
         console.log("Restoring session for %s", user_id);
-        setLoggedIn({
-            userId: user_id,
-            deviceId: device_id,
-            accessToken: access_token,
-            homeserverUrl: hs_url,
-            identityServerUrl: is_url,
-            guest: is_guest,
-        });
-        return true;
+        try {
+            setLoggedIn({
+                userId: user_id,
+                deviceId: device_id,
+                accessToken: access_token,
+                homeserverUrl: hs_url,
+                identityServerUrl: is_url,
+                guest: is_guest,
+            });
+            return true;
+        } catch (e) {
+            console.log("Unable to restore session", e);
+
+            var msg = e.message;
+            if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
+                msg = "You need to log back in to generate and submit "
+                    + "end-to-end encryption keys. This is a once off; sorry "
+                    + "for the inconvenience.";
+            }
+
+            // don't leak things into the new session
+            _clearLocalStorage();
+
+            throw new Error("Unable to restore previous session: " + msg);
+        }
     } else {
         console.log("No previous session found.");
         return false;
@@ -305,22 +321,27 @@ export function startMatrixClient() {
  * a session has been logged out / ended.
  */
 export function onLoggedOut() {
-    if (window.localStorage) {
-        const hsUrl = window.localStorage.getItem("mx_hs_url");
-        const isUrl = window.localStorage.getItem("mx_is_url");
-        window.localStorage.clear();
-        // preserve our HS & IS URLs for convenience
-        // N.B. we cache them in hsUrl/isUrl and can't really inline them
-        // as getCurrentHsUrl() may call through to localStorage.
-        // NB. We do clear the device ID (as well as all the settings)
-        if (hsUrl) window.localStorage.setItem("mx_hs_url", hsUrl);
-        if (isUrl) window.localStorage.setItem("mx_is_url", isUrl);
-    }
+    _clearLocalStorage();
     stopMatrixClient();
-
     dis.dispatch({action: 'on_logged_out'});
 }
 
+function _clearLocalStorage() {
+    if (!window.localStorage) {
+        return;
+    }
+    const hsUrl = window.localStorage.getItem("mx_hs_url");
+    const isUrl = window.localStorage.getItem("mx_is_url");
+    window.localStorage.clear();
+
+    // preserve our HS & IS URLs for convenience
+    // N.B. we cache them in hsUrl/isUrl and can't really inline them
+    // as getCurrentHsUrl() may call through to localStorage.
+    // NB. We do clear the device ID (as well as all the settings)
+    if (hsUrl) window.localStorage.setItem("mx_hs_url", hsUrl);
+    if (isUrl) window.localStorage.setItem("mx_is_url", isUrl);
+}
+
 /**
  * Stop all the background processes related to the current client
  */

From f9d8829ba2aa8f060c8b1ab99ef664795bc36da2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 15:38:28 +0100
Subject: [PATCH 11/26] let you join confs either as voice or video

---
 src/components/views/rooms/AuxPanel.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index ec885989bc..10a411aea9 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -57,10 +57,10 @@ module.exports = React.createClass({
         }
     },
 
-    onConferenceNotificationClick: function() {
+    onConferenceNotificationClick: function(type) {
         dis.dispatch({
             action: 'place_call',
-            type: "video",
+            type: type,
             room_id: this.props.room.roomId,
         });
     },
@@ -85,14 +85,19 @@ module.exports = React.createClass({
 
         var conferenceCallNotification = null;
         if (this.props.displayConfCallNotification) {
-            var supportedText;
+            var supportedText, joinText;
             if (!MatrixClientPeg.get().supportsVoip()) {
                 supportedText = " (unsupported)";
             }
+            else {
+                joinText = (<span>
+                    Join as <a onClick={this.onConferenceNotificationClick.bind(this, 'voice')} href="#">voice</a> or <a onClick={this.onConferenceNotificationClick.bind(this, 'video')} href="#">video</a>.
+                </span>);
+
+            }
             conferenceCallNotification = (
-                <div className="mx_RoomView_ongoingConfCallNotification"
-                        onClick={this.onConferenceNotificationClick}>
-                    Ongoing conference call {supportedText}
+                <div className="mx_RoomView_ongoingConfCallNotification">
+                    Ongoing conference call{ supportedText }. { joinText }
                 </div>
             );
         }

From 6ec7e5df2808bd52ba3f44204fac4b59c867902b Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 2 Sep 2016 16:03:24 +0100
Subject: [PATCH 12/26] Move scalar auth stuff to ScalarAuthClient from
 RoomSettings

---
 src/ScalarAuthClient.js                      | 41 +++++++++++++++++++-
 src/components/views/messages/TextualBody.js |  8 ++++
 src/components/views/rooms/RoomSettings.js   | 41 ++++++--------------
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index d145cebfe0..7721add5cf 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -18,9 +18,41 @@ var q = require("q");
 var request = require('browser-request');
 
 var SdkConfig = require('./SdkConfig');
+var MatrixClientPeg = require('./MatrixClientPeg');
 
 class ScalarAuthClient {
-    getScalarToken(openid_token_object) {
+
+    constructor() {
+        this.scalarToken = null;
+    }
+
+    connect() {
+        return this.getScalarToken().then((tok) => {
+            this.scalarToken = tok;
+        });
+    }
+
+    hasCredentials() {
+        return this.scalarToken != null; // undef or null
+    }
+
+    // Returns a scalar_token string
+    getScalarToken() {
+        var tok = window.localStorage.getItem("mx_scalar_token");
+        if (tok) return q(tok);
+
+        // No saved token, so do the dance to get one. First, we
+        // need an openid bearer token from the HS.
+        return MatrixClientPeg.get().getOpenIdToken().then((token_object) => {
+            // Now we can send that to scalar and exchange it for a scalar token
+            return this.exchangeForScalarToken(token_object);
+        }).then((token_object) => {
+            window.localStorage.setItem("mx_scalar_token", token_object);
+            return token_object;
+        });
+    }
+
+    exchangeForScalarToken(openid_token_object) {
         var defer = q.defer();
 
         var scalar_rest_url = SdkConfig.get().integrations_rest_url;
@@ -43,6 +75,13 @@ class ScalarAuthClient {
 
         return defer.promise;
     }
+
+    getScalarInterfaceUrlForRoom(roomId) {
+        var url = SdkConfig.get().integrations_ui_url;
+        url += "?scalar_token=" + encodeURIComponent(this.scalarToken);
+        url += "&room_id=" + encodeURIComponent(roomId);
+        return url;
+    }
 }
 
 module.exports = ScalarAuthClient;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 19ca9657c2..47e69d9d29 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -176,15 +176,23 @@ module.exports = React.createClass({
         }
     },
 
+    onStarterLinkClick: function() {
+    },
+
     render: function() {
         const EmojiText = sdk.getComponent('elements.EmojiText');
         var mxEvent = this.props.mxEvent;
         var content = mxEvent.getContent();
+
         var body = HtmlUtils.bodyToHtml(content, this.props.highlights, {});
 
         if (this.props.highlightLink) {
             body = <a href={ this.props.highlightLink }>{ body }</a>;
         }
+        else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
+            console.log("Set starter link");
+            body = <a href={ content.data["org.matrix.neb.starter_link"] }>{ body }</a>;
+        }
 
         var widgets;
         if (this.state.links.length && !this.state.widgetHidden && this.props.showUrlPreview) {
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 145b8559b7..dd3b12b4fc 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -65,7 +65,6 @@ module.exports = React.createClass({
             // Default to false if it's undefined, otherwise react complains about changing
             // components from uncontrolled to controlled
             isRoomPublished: this._originalIsRoomPublished || false,
-            scalar_token: null,
             scalar_error: null,
         };
     },
@@ -81,11 +80,14 @@ module.exports = React.createClass({
             console.error("Failed to get room visibility: " + err);
         });
 
-        this.getScalarToken().done((token) => {
-            this.setState({scalar_token: token});
+        this.scalarClient = new ScalarAuthClient();
+        this.scalarClient.connect().done(() => {
+            this.forceUpdate();
         }, (err) => {
-            this.setState({scalar_error: err});
-        });
+            this.setState({
+                scalar_error: err
+            });
+        })
 
         dis.dispatch({
             action: 'ui_opacity',
@@ -395,34 +397,13 @@ module.exports = React.createClass({
                 roomState.mayClientSendStateEvent("m.room.guest_access", cli))
     },
 
-    getScalarInterfaceUrl: function() {
-        var url = SdkConfig.get().integrations_ui_url;
-        url += "?scalar_token=" + encodeURIComponent(this.state.scalar_token);
-        url += "&room_id=" + encodeURIComponent(this.props.room.roomId);
-        return url;
-    },
-
-    getScalarToken() {
-        var tok = window.localStorage.getItem("mx_scalar_token");
-        if (tok) return q(tok);
-
-        // No saved token, so do the dance to get one. First, we
-        // need an openid bearer token from the HS.
-        return MatrixClientPeg.get().getOpenIdToken().then((token_object) => {
-            // Now we can send that to scalar and exchange it for a scalar token
-            var scalar_auth_client = new ScalarAuthClient();
-            return scalar_auth_client.getScalarToken(token_object);
-        }).then((token_object) => {
-            window.localStorage.setItem("mx_scalar_token", token_object);
-            return token_object;
-        });
-    },
-
     onManageIntegrations(ev) {
         ev.preventDefault();
         var IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
         Modal.createDialog(IntegrationsManager, {
-            src: this.state.scalar_token ? this.getScalarInterfaceUrl() : null
+            src: this.scalarClient.hasCredentials() ?
+                    this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId) :
+                    null
         }, "");
     },
 
@@ -649,7 +630,7 @@ module.exports = React.createClass({
         if (UserSettingsStore.isFeatureEnabled("integration_management")) {
             let integrations_body;
 
-            if (this.state.scalar_token) {
+            if (this.scalarClient.hasCredentials()) {
                 integrations_body = (
                     <div className="mx_RoomSettings_settings">
                         <a href="#" onClick={ this.onManageIntegrations }>Manage integrations</a>

From 45ada1887de91939b2a4b7a8c19df0356a02a5bf Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 2 Sep 2016 16:36:43 +0100
Subject: [PATCH 13/26] Implement starter link support

This involves modal dialogs because browsers are *terrible*.
---
 src/ScalarAuthClient.js                      |  4 ++
 src/components/views/messages/TextualBody.js | 53 ++++++++++++++++++--
 src/components/views/rooms/RoomSettings.js   | 18 ++++---
 3 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 7721add5cf..e1928e15d4 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -82,6 +82,10 @@ class ScalarAuthClient {
         url += "&room_id=" + encodeURIComponent(roomId);
         return url;
     }
+
+    getStarterLink(starterLinkUrl) {
+        return starterLinkUrl + "?scalar_token=" + encodeURIComponent(this.scalarToken);
+    }
 }
 
 module.exports = ScalarAuthClient;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 47e69d9d29..e6ed354f29 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -23,6 +23,10 @@ var linkify = require('linkifyjs');
 var linkifyElement = require('linkifyjs/element');
 var linkifyMatrix = require('../../../linkify-matrix');
 var sdk = require('../../../index');
+var ScalarAuthClient = require("../../../ScalarAuthClient");
+var Modal = require("../../../Modal");
+var SdkConfig = require('../../../SdkConfig');
+var UserSettingsStore = require('../../../UserSettingsStore');
 
 linkifyMatrix(linkify);
 
@@ -176,7 +180,50 @@ module.exports = React.createClass({
         }
     },
 
-    onStarterLinkClick: function() {
+    onStarterLinkClick: function(starterLink) {
+        // We need to add on our scalar token to the starter link, but we may not have one!
+        // In addition, we can't fetch one on click and then go to it immediately as that
+        // is then treated as a popup!
+        // We can get around this by fetching one now and showing a "confirmation dialog" (hurr hurr)
+        // which requires the user to click through and THEN we can open the link in a new tab because
+        // the window.open command occurs in the same stack frame as the onClick callback.
+
+        let integrationsEnabled = UserSettingsStore.isFeatureEnabled("integration_management");
+        if (!integrationsEnabled) {
+            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createDialog(ErrorDialog, {
+                title: "Integrations disabled",
+                description: "You need to enable the Labs option 'Integrations Management' in your Vector user settings first.",
+            });
+            return;
+        }
+
+        // Go fetch a scalar token
+        let scalarClient = new ScalarAuthClient();
+        scalarClient.connect().then(() => {
+            let completeUrl = scalarClient.getStarterLink(starterLink);
+            let QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+            let integrationsUrl = SdkConfig.get().integrations_ui_url;
+            Modal.createDialog(QuestionDialog, {
+                title: "Add an Integration",
+                description:
+                    <div>
+                        You are about to taken to a third-party site so you can authenticate your account for use with {integrationsUrl}.<br/>
+                        Do you wish to continue?
+                    </div>,
+                button: "Continue",
+                onFinished: function(confirmed) {
+                    if (!confirmed) {
+                        return;
+                    }
+                    let width  = window.screen.width  > 1024 ? 1024 : window.screen.width;
+                    let height = window.screen.height > 800  ? 800 : window.screen.height;
+                    let left = (window.screen.width - width) / 2;
+                    let top = (window.screen.height - height) / 2;
+                    window.open(completeUrl, '_blank', `height=${height}, width=${width}, top=${top}, left=${left},`);
+                },
+            });
+        });
     },
 
     render: function() {
@@ -190,8 +237,8 @@ module.exports = React.createClass({
             body = <a href={ this.props.highlightLink }>{ body }</a>;
         }
         else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
-            console.log("Set starter link");
-            body = <a href={ content.data["org.matrix.neb.starter_link"] }>{ body }</a>;
+            // FIXME: React replaces this with a <span> because there is no href= - Matthew haaaalp!
+            body = <a onClick={ this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"]) }>{ body }</a>;
         }
 
         var widgets;
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index dd3b12b4fc..fab0170ad8 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -80,14 +80,16 @@ module.exports = React.createClass({
             console.error("Failed to get room visibility: " + err);
         });
 
-        this.scalarClient = new ScalarAuthClient();
-        this.scalarClient.connect().done(() => {
-            this.forceUpdate();
-        }, (err) => {
-            this.setState({
-                scalar_error: err
-            });
-        })
+        if (UserSettingsStore.isFeatureEnabled("integration_management")) {
+            this.scalarClient = new ScalarAuthClient();
+            this.scalarClient.connect().done(() => {
+                this.forceUpdate();
+            }, (err) => {
+                this.setState({
+                    scalar_error: err
+                });
+            })
+        }
 
         dis.dispatch({
             action: 'ui_opacity',

From f5fe4b24336a8245b5a08050fefe13b9999d92fb Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 2 Sep 2016 16:54:27 +0100
Subject: [PATCH 14/26] Show something when we see a no-op join event

As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
---
 src/TextForEvent.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 93f5f7c4e2..f32d1a7132 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -62,6 +62,9 @@ function textForMemberEvent(ev) {
                     return senderName + " changed their profile picture";
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
                     return senderName + " set a profile picture";
+                } else {
+                    // hacky hack for https://github.com/vector-im/vector-web/issues/2020
+                    return senderName + " rejoined the room.";
                 }
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);

From fd0ed4a406c330fa7bf3d5f4c7f41473d64e3acf Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 2 Sep 2016 16:54:27 +0100
Subject: [PATCH 15/26] Show something when we see a no-op join event

As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
---
 src/TextForEvent.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 93f5f7c4e2..f32d1a7132 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -62,6 +62,9 @@ function textForMemberEvent(ev) {
                     return senderName + " changed their profile picture";
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
                     return senderName + " set a profile picture";
+                } else {
+                    // hacky hack for https://github.com/vector-im/vector-web/issues/2020
+                    return senderName + " rejoined the room.";
                 }
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);

From 6de2e8bda500f3506eae3926e4406f8a47d101b8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:13:52 +0100
Subject: [PATCH 16/26] update changelog

---
 CHANGELOG.md                               | 7 +++++++
 src/components/structures/TimelinePanel.js | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03096b04b8..c024595205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.6.5-r2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r2) (2016-09-02)
+=========================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5-r1...v0.6.5-r2)
+
+ * Workaround vector-im/vector-web#2020 where floods of joins could crash the browser
+   (as seen in #matrix-dev right now)
+
 Changes in [0.6.5-r1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r1) (2016-09-01)
 =========================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5...v0.6.5-r1)
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index c80a8c89d7..715cc5a4c8 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -32,7 +32,7 @@ var KeyCode = require('../../KeyCode');
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
 
-var DEBUG = false;
+var DEBUG = true;
 
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console

From c2ca261085b296ed9878c2b5b44ff9d5b936212d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:13:59 +0100
Subject: [PATCH 17/26] 0.6.5-r2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c154f7bc88..3398226389 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.6.5-r1",
+  "version": "0.6.5-r2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From d5062f1ff7f5a072c15659508b32ca96f51483d3 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:15:21 +0100
Subject: [PATCH 18/26] gah, revert debug

---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 715cc5a4c8..c80a8c89d7 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -32,7 +32,7 @@ var KeyCode = require('../../KeyCode');
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
 
-var DEBUG = true;
+var DEBUG = false;
 
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console

From 714060ec8f81987009782b3b36845c2a501d0e4c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:17:00 +0100
Subject: [PATCH 19/26] Prepare changelog for v0.6.5-r3

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c024595205..af1c994ee3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.6.5-r3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r3) (2016-09-02)
+=========================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5-r2...v0.6.5-r3)
+
+ * revert accidental debug logging >:(
+
+
 Changes in [0.6.5-r2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r2) (2016-09-02)
 =========================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5-r1...v0.6.5-r2)

From 14227b57184ec82bee3640cd2a2e3199bf992498 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:17:01 +0100
Subject: [PATCH 20/26] 0.6.5-r3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3398226389..abd9649679 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.6.5-r2",
+  "version": "0.6.5-r3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From dbd17ea953039efae33da8cf40babaea1d1c5f8e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 2 Sep 2016 17:37:16 +0100
Subject: [PATCH 21/26] improve e2e warning a bit

---
 src/Lifecycle.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 442a5beec3..9f9b4b5389 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -212,9 +212,9 @@ function _restoreFromLocalStorage() {
 
             var msg = e.message;
             if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
-                msg = "You need to log back in to generate and submit "
-                    + "end-to-end encryption keys. This is a once off; sorry "
-                    + "for the inconvenience.";
+                msg = "You need to log back in to generate end-to-end encryption keys "
+                    + "for this device and submit the public key to your homeserver. "
+                    + "This is a once off; sorry for the inconvenience.";
             }
 
             // don't leak things into the new session

From fdfd6ecfd9d6890e90c4931ac0afb90627f286b6 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 3 Sep 2016 13:27:46 +0100
Subject: [PATCH 22/26] let users join confs as voice or video

---
 src/components/views/rooms/AuxPanel.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 10a411aea9..4eaa19193e 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -57,12 +57,14 @@ module.exports = React.createClass({
         }
     },
 
-    onConferenceNotificationClick: function(type) {
+    onConferenceNotificationClick: function(ev, type) {
         dis.dispatch({
             action: 'place_call',
             type: type,
             room_id: this.props.room.roomId,
         });
+        ev.stopPropagation();
+        ev.preventDefault();
     },
 
     render: function() {
@@ -91,7 +93,8 @@ module.exports = React.createClass({
             }
             else {
                 joinText = (<span>
-                    Join as <a onClick={this.onConferenceNotificationClick.bind(this, 'voice')} href="#">voice</a> or <a onClick={this.onConferenceNotificationClick.bind(this, 'video')} href="#">video</a>.
+                    Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice')}} href="#">voice</a>&nbsp;
+                    or <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video') }} href="#">video</a>.
                 </span>);
 
             }

From bc8e7724e8ccb4e90eb27b062fbce8a2a6379297 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Sat, 3 Sep 2016 18:42:54 +0100
Subject: [PATCH 23/26] Make the 'encrypt this room' knob be megolm

---
 src/components/views/rooms/RoomSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 145b8559b7..b09001b60a 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -249,7 +249,7 @@ module.exports = React.createClass({
         var roomId = this.props.room.roomId;
         return MatrixClientPeg.get().sendStateEvent(
             roomId, "m.room.encryption",
-            { algorithm: "m.olm.v1.curve25519-aes-sha2" }
+            { algorithm: "m.megolm.v1.aes-sha2" }
         );
     },
 

From a316c652b74dae5b0a2506c511e143106cc7911d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Sun, 4 Sep 2016 14:01:19 +0100
Subject: [PATCH 24/26] Convert MemberDeviceInfo to ES6 class

---
 .../views/rooms/MemberDeviceInfo.js           | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index 7e684c89a2..775c905abd 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -14,41 +14,43 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var MatrixClientPeg = require("../../../MatrixClientPeg");
+import React from 'react';
+import MatrixClientPeg from '../../../MatrixClientPeg';
 
-module.exports = React.createClass({
-    displayName: 'MemberDeviceInfo',
-    propTypes: {
-        userId: React.PropTypes.string.isRequired,
-        device: React.PropTypes.object.isRequired,
-    },
+export default class MemberDeviceInfo extends React.Component {
+    constructor(props) {
+        super(props);
+        this.onVerifyClick = this.onVerifyClick.bind(this);
+        this.onUnverifyClick = this.onUnverifyClick.bind(this);
+        this.onBlockClick = this.onBlockClick.bind(this);
+        this.onUnblockClick = this.onUnblockClick.bind(this);
+    }
 
-    onVerifyClick: function() {
+    onVerifyClick() {
         MatrixClientPeg.get().setDeviceVerified(
             this.props.userId, this.props.device.id, true
         );
-    },
+    }
 
-    onUnverifyClick: function() {
+    onUnverifyClick() {
         MatrixClientPeg.get().setDeviceVerified(
             this.props.userId, this.props.device.id, false
         );
-    },
+    }
 
-    onBlockClick: function() {
+    onBlockClick() {
         MatrixClientPeg.get().setDeviceBlocked(
             this.props.userId, this.props.device.id, true
         );
-    },
+    }
 
-    onUnblockClick: function() {
+    onUnblockClick() {
         MatrixClientPeg.get().setDeviceBlocked(
             this.props.userId, this.props.device.id, false
         );
-    },
+    }
 
-    render: function() {
+    render() {
         var indicator = null, blockButton = null, verifyButton = null;
         if (this.props.device.blocked) {
             blockButton = (
@@ -107,5 +109,11 @@ module.exports = React.createClass({
                 {blockButton}
             </div>
         );
-    },
-});
+    }
+};
+
+MemberDeviceInfo.displayName = 'MemberDeviceInfo';
+MemberDeviceInfo.propTypes = {
+    userId: React.PropTypes.string.isRequired,
+    device: React.PropTypes.object.isRequired,
+};

From fc40bdcbfc89b15c1e7cc40f7064de4246089bfc Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Sun, 4 Sep 2016 21:49:32 +0100
Subject: [PATCH 25/26] Make MemberInfo to use client.getStoredDevicesForUser

It's more powerful than listDeviceKeys, and isn't deprecated.
---
 .../views/rooms/MemberDeviceInfo.js           | 24 +++++++++----------
 src/components/views/rooms/MemberInfo.js      |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index 7e684c89a2..dfdbf53775 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -26,31 +26,31 @@ module.exports = React.createClass({
 
     onVerifyClick: function() {
         MatrixClientPeg.get().setDeviceVerified(
-            this.props.userId, this.props.device.id, true
+            this.props.userId, this.props.device.deviceId, true
         );
     },
 
     onUnverifyClick: function() {
         MatrixClientPeg.get().setDeviceVerified(
-            this.props.userId, this.props.device.id, false
+            this.props.userId, this.props.device.deviceId, false
         );
     },
 
     onBlockClick: function() {
         MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.props.device.id, true
+            this.props.userId, this.props.device.deviceId, true
         );
     },
 
     onUnblockClick: function() {
         MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.props.device.id, false
+            this.props.userId, this.props.device.deviceId, false
         );
     },
 
     render: function() {
         var indicator = null, blockButton = null, verifyButton = null;
-        if (this.props.device.blocked) {
+        if (this.props.device.isBlocked()) {
             blockButton = (
                 <div className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblock"
                   onClick={this.onUnblockClick}>
@@ -66,7 +66,7 @@ module.exports = React.createClass({
             );
         }
 
-        if (this.props.device.verified) {
+        if (this.props.device.isVerified()) {
             verifyButton = (
                 <div className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify"
                   onClick={this.onUnverifyClick}>
@@ -82,22 +82,22 @@ module.exports = React.createClass({
             );
         }
 
-        if (this.props.device.blocked) {
+        if (this.props.device.isBlocked()) {
             indicator = (
-                <div className="mx_MemberDeviceInfo_blocked">&#x2716;</div>
+                <div className="mx_MemberDeviceInfo_blocked">Blocked</div>
             );
-        } else if (this.props.device.verified) {
+        } else if (this.props.device.isVerified()) {
             indicator = (
-                    <div className="mx_MemberDeviceInfo_verified">&#x2714;</div>
+                    <div className="mx_MemberDeviceInfo_verified">Verified</div>
             );
 
         } else {
             indicator = (
-                <div className="mx_MemberDeviceInfo_unverified">?</div>
+                <div className="mx_MemberDeviceInfo_unverified">Unverified</div>
             );
         }
 
-        var deviceName = this.props.device.display_name || this.props.device.id;
+        var deviceName = this.props.device.display_name || this.props.device.deviceId;
 
         return (
             <div className="mx_MemberDeviceInfo">
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index c02b009c39..be6663be67 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -159,7 +159,7 @@ module.exports = React.createClass({
         if (userId == this.props.member.userId) {
             // no need to re-download the whole thing; just update our copy of
             // the list.
-            var devices = MatrixClientPeg.get().listDeviceKeys(userId);
+            var devices = MatrixClientPeg.get().getStoredDevicesForUser(userId);
             this.setState({devices: devices});
         }
     },
@@ -195,7 +195,7 @@ module.exports = React.createClass({
                 // we got cancelled - presumably a different user now
                 return;
             }
-            var devices = client.listDeviceKeys(member.userId);
+            var devices = client.getStoredDevicesForUser(member.userId);
             self.setState({devicesLoading: false, devices: devices});
         }, function(err) {
             console.log("Error downloading devices", err);

From 56ac0004e5cbe4cbe3305618d1e39e6f2f86ac18 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 5 Sep 2016 09:10:15 +0100
Subject: [PATCH 26/26] Use href='#' hack to make link text look like a link

---
 src/components/views/messages/TextualBody.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index e6ed354f29..6bb1a994d5 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -180,7 +180,8 @@ module.exports = React.createClass({
         }
     },
 
-    onStarterLinkClick: function(starterLink) {
+    onStarterLinkClick: function(starterLink, ev) {
+        ev.preventDefault();
         // We need to add on our scalar token to the starter link, but we may not have one!
         // In addition, we can't fetch one on click and then go to it immediately as that
         // is then treated as a popup!
@@ -237,8 +238,7 @@ module.exports = React.createClass({
             body = <a href={ this.props.highlightLink }>{ body }</a>;
         }
         else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
-            // FIXME: React replaces this with a <span> because there is no href= - Matthew haaaalp!
-            body = <a onClick={ this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"]) }>{ body }</a>;
+            body = <a href="#" onClick={ this.onStarterLinkClick.bind(this, content.data["org.matrix.neb.starter_link"]) }>{ body }</a>;
         }
 
         var widgets;