From c633df3c15b1e977bd55193a8c928128c5488927 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 18 Sep 2019 12:16:41 +0100 Subject: [PATCH 1/2] Use same initial device name rules for SSO login as password login Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MatrixChat.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index d205326d0d..306ef03fb1 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -286,7 +286,10 @@ export default createReactClass({ // the first thing to do is to try the token params in the query-string // if the session isn't soft logged out (ie: is a clean session being logged in) if (!Lifecycle.isSoftLogout()) { - Lifecycle.attemptTokenLogin(this.props.realQueryParams).then((loggedIn) => { + Lifecycle.attemptTokenLogin( + this.props.realQueryParams, + this.props.defaultDeviceDisplayName, + ).then((loggedIn) => { if (loggedIn) { this.props.onTokenLoginCompleted(); From c286f2214f8858977938f67ec170377902a7e829 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 18 Sep 2019 14:09:38 +0100 Subject: [PATCH 2/2] Fix disabled save button on message editor when pasting Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/rooms/BasicMessageComposer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js index eabb97a6f5..110df355fe 100644 --- a/src/components/views/rooms/BasicMessageComposer.js +++ b/src/components/views/rooms/BasicMessageComposer.js @@ -179,6 +179,7 @@ export default class BasicMessageEditor extends React.Component { const {partCreator} = model; const text = event.clipboardData.getData("text/plain"); if (text) { + this._modifiedFlag = true; const range = getRangeForSelection(this._editorRef, model, document.getSelection()); const parts = parsePlainTextMessage(text, partCreator); replaceRangeAndMoveCaret(range, parts);