Merge branch 'develop' into wmwragg/direct-chat-sublist

src/components/structures/MatrixChat.js

@@ -58,6 +58,10 @@ module.exports = React.createClass({
 
         // called when the session load completes
         onLoadCompleted: React.PropTypes.func,
+
+        // displayname, if any, to set on the device when logging
+        // in/registering.
+        defaultDeviceDisplayName: React.PropTypes.string,
     },
 
     PageTypes: {
@@ -185,6 +189,7 @@ module.exports = React.createClass({
             enableGuest: this.props.enableGuest,
             guestHsUrl: this.getCurrentHsUrl(),
             guestIsUrl: this.getCurrentIsUrl(),
+            defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
         }).done(()=>{
             // stuff this through the dispatcher so that it happens
             // after the on_logged_in action.
@@ -193,7 +198,7 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
-        this._stopMatrixClient();
+        Lifecycle.stopMatrixClient();
         dis.unregister(this.dispatcherRef);
         document.removeEventListener("keydown", this.onKeyDown);
         window.removeEventListener("focus", this.onFocus);
@@ -601,16 +606,6 @@ module.exports = React.createClass({
         });
     },
 
-    // stop all the background processes related to the current client
-    _stopMatrixClient: function() {
-        Notifier.stop();
-        UserActivity.stop();
-        Presence.stop();
-        MatrixClientPeg.get().stopClient();
-        MatrixClientPeg.get().removeAllListeners();
-        MatrixClientPeg.unset();
-    },
-
     onKeyDown: function(ev) {
             /*
             // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers
@@ -935,10 +930,8 @@ module.exports = React.createClass({
         var NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         var ForgotPassword = sdk.getComponent('structures.login.ForgotPassword');
 
-        // work out the HS URL prompts we should show for
-
-        console.log("rendering; loading="+this.state.loading+"; screen="+this.state.screen +
-                    "; logged_in="+this.state.logged_in+"; ready="+this.state.ready);
+        // console.log("rendering; loading="+this.state.loading+"; screen="+this.state.screen +
+        //             "; logged_in="+this.state.logged_in+"; ready="+this.state.ready);
 
         if (this.state.loading) {
             var Spinner = sdk.getComponent('elements.Spinner');
@@ -1051,6 +1044,7 @@ module.exports = React.createClass({
                     customHsUrl={this.getCurrentHsUrl()}
                     customIsUrl={this.getCurrentIsUrl()}
                     registrationUrl={this.props.registrationUrl}
+                    defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     onLoggedIn={this.onRegistered}
                     onLoginClick={this.onLoginClick}
                     onRegisterClick={this.onRegisterClick}
@@ -1077,6 +1071,7 @@ module.exports = React.createClass({
                     customHsUrl={this.getCurrentHsUrl()}
                     customIsUrl={this.getCurrentIsUrl()}
                     fallbackHsUrl={this.getFallbackHsUrl()}
+                    defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     enableGuest={this.props.enableGuest}
                     onCancelClick={this.guestCreds ? this.onReturnToGuestClick : null}

src/components/structures/login/Login.js

@@ -44,6 +44,8 @@ module.exports = React.createClass({
         // different home server without confusing users.
         fallbackHsUrl: React.PropTypes.string,
 
+        defaultDeviceDisplayName: React.PropTypes.string,
+
         // login shouldn't know or care how registration is done.
         onRegisterClick: React.PropTypes.func.isRequired,
 
@@ -136,7 +138,9 @@ module.exports = React.createClass({
 
         var fallbackHsUrl = hsUrl == this.props.defaultHsUrl ? this.props.fallbackHsUrl : null;
 
-        var loginLogic = new Signup.Login(hsUrl, isUrl, fallbackHsUrl);
+        var loginLogic = new Signup.Login(hsUrl, isUrl, fallbackHsUrl, {
+            defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
+        });
         this._loginLogic = loginLogic;
 
         loginLogic.getFlows().then(function(flows) {

src/components/structures/login/Registration.js

@@ -45,6 +45,9 @@ module.exports = React.createClass({
         email: React.PropTypes.string,
         username: React.PropTypes.string,
         guestAccessToken: React.PropTypes.string,
+
+        defaultDeviceDisplayName: React.PropTypes.string,
+
         // registration shouldn't know or care how login is done.
         onLoginClick: React.PropTypes.func.isRequired,
         onCancelClick: React.PropTypes.func
@@ -71,7 +74,9 @@ module.exports = React.createClass({
         this.dispatcherRef = dis.register(this.onAction);
         // attach this to the instance rather than this.state since it isn't UI
         this.registerLogic = new Signup.Register(
-            this.props.customHsUrl, this.props.customIsUrl
+            this.props.customHsUrl, this.props.customIsUrl, {
+                defaultDeviceDisplayName: this.props.defaultDeviceDisplayName,
+            }
         );
         this.registerLogic.setClientSecret(this.props.clientSecret);
         this.registerLogic.setSessionId(this.props.sessionId);
@@ -154,6 +159,7 @@ module.exports = React.createClass({
             }
             self.props.onLoggedIn({
                 userId: response.user_id,
+                deviceId: response.device_id,
                 homeserverUrl: self.registerLogic.getHomeserverUrl(),
                 identityServerUrl: self.registerLogic.getIdentityServerUrl(),
                 accessToken: response.access_token
@@ -279,7 +285,7 @@ module.exports = React.createClass({
 
         var returnToAppJsx;
         if (this.props.onCancelClick) {
-            returnToAppJsx = 
+            returnToAppJsx =
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
                     Return to app
                 </a>