- ![]({require("../../../../res/img/warning.svg")})
-
- { _t("Yes, I want to help!") }
-
-
- ![{_t('Close')}]({require("../../../../res/img/cancel.svg")})
-
-
- );
- }
-}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8ac05bf429..a79ee97109 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -391,10 +391,17 @@
"Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
"Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
"Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
+ "Notifications": "Notifications",
+ "Send
-
- { this.props.policyUrl ? _t(
- "Please help improve Riot.im by sending anonymous usage data . " +
- "This will use a cookie " +
- "(please see our Cookie Policy ).",
- {},
- {
- 'UsageDataLink': (sub) =>
- { sub }
- ,
- // XXX: We need to link to the page that explains our cookies
- 'PolicyLink': (sub) =>
- { sub }
-
- ,
- },
- ) : _t(
- "Please help improve Riot.im by sending anonymous usage data . " +
- "This will use a cookie.",
- {},
- {
- 'UsageDataLink': (sub) =>
- { sub }
- ,
- },
- ) }
-
-
-
-
-
- );
- },
-});
diff --git a/src/toasts/SetPasswordToast.ts b/src/toasts/SetPasswordToast.ts
new file mode 100644
index 0000000000..88cc317978
--- /dev/null
+++ b/src/toasts/SetPasswordToast.ts
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 { _t } from "../languageHandler";
+import Modal from "../Modal";
+import SetPasswordDialog from "../components/views/dialogs/SetPasswordDialog";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+
+const onAccept = () => {
+ Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog);
+};
+
+const TOAST_KEY = "setpassword";
+
+export const showToast = () => {
+ ToastStore.sharedInstance().addOrReplaceToast({
+ key: TOAST_KEY,
+ title: _t("Set password"),
+ props: {
+ description: _t("To return to your account in future you need to set a password"),
+ acceptLabel: _t("Set Password"),
+ onAccept,
+ rejectLabel: _t("Later"),
+ onReject: hideToast, // it'll return on reload
+ },
+ component: GenericToast,
+ priority: 60,
+ });
+};
+
+export const hideToast = () => {
+ ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
From ccf9e6512341bb7395b1eba3841b0ce475379da5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 22:27:19 +0100
Subject: [PATCH 07/50] Migrate Server Limit Bar Banner to a Toast
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LoggedInView.tsx | 56 ++++++-----
.../views/globals/ServerLimitBar.js | 99 -------------------
src/toasts/ServerLimitToast.tsx | 50 ++++++++++
3 files changed, 80 insertions(+), 125 deletions(-)
delete mode 100644 src/components/views/globals/ServerLimitBar.js
create mode 100644 src/toasts/ServerLimitToast.tsx
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 131e6a3867..edb2482aa3 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -47,6 +47,10 @@ import {
showToast as showSetPasswordToast,
hideToast as hideSetPasswordToast
} from "../../toasts/SetPasswordToast";
+import {
+ showToast as showServerLimitToast,
+ hideToast as hideServerLimitToast
+} from "../../toasts/ServerLimitToast";
// We need to fetch each pinned message individually (if we don't already have it)
// so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -99,7 +103,6 @@ interface IState {
};
syncErrorData: any;
useCompactLayout: boolean;
- serverNoticeEvents: MatrixEvent[];
}
/**
@@ -144,8 +147,6 @@ class LoggedInView extends React.PureComponent
-
- { _t(
- "To return to your account in future you need to set a password",
- {},
- { 'u': (sub) => { sub } },
- ) }
-
-
-
-
- );
- },
-});
diff --git a/src/toasts/ServerLimitToast.tsx b/src/toasts/ServerLimitToast.tsx
new file mode 100644
index 0000000000..f2de9e3499
--- /dev/null
+++ b/src/toasts/ServerLimitToast.tsx
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 React from "react";
+
+import { _t, _td } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import {messageForResourceLimitError} from "../utils/ErrorUtils";
+
+const TOAST_KEY = "serverlimit";
+
+export const showToast = (limitType: string, adminContact?: string, syncError?: boolean) => {
+ const errorText = messageForResourceLimitError(limitType, adminContact, {
+ 'monthly_active_user': _td("Your homeserver has exceeded its user limit."),
+ '': _td("Your homeserver has exceeded one of its resource limits."),
+ });
+ const contactText = messageForResourceLimitError(limitType, adminContact, {
+ '': _td("Contact your server admin."),
+ });
+
+ ToastStore.sharedInstance().addOrReplaceToast({
+ key: TOAST_KEY,
+ title: _t("Notifications"),
+ props: {
+ description:
- {limitError}
- {' '}
- {adminContact}
-
- {releaseNotes}
,
- button: _t("Update"),
- onFinished: (update) => {
- if (update && PlatformPeg.get()) {
- PlatformPeg.get().installUpdate();
- }
- },
- });
- },
-
- displayChangelog: function() {
- const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
- Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
- version: this.props.version,
- newVersion: this.props.newVersion,
- onFinished: (update) => {
- if (update && PlatformPeg.get()) {
- PlatformPeg.get().installUpdate();
- }
- },
- });
- },
-
- onUpdateClicked: function() {
- PlatformPeg.get().installUpdate();
- },
-
- render: function() {
- let action_button;
- // If we have release notes to display, we display them. Otherwise,
- // we display the Changelog Dialog which takes two versions and
- // automatically tells you what's changed (provided the versions
- // are in the right format)
- if (this.props.releaseNotes) {
- action_button = (
-
- );
- } else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
- action_button = (
-
- );
- } else if (PlatformPeg.get()) {
- action_button = (
-
- );
- }
- return (
-
-
-
- );
- },
-});
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 72c19587c8..0170aee17a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -421,6 +421,12 @@
"Other users may not trust it": "Other users may not trust it",
"New login. Was this you?": "New login. Was this you?",
"Verify the new login accessing your account: %(name)s": "Verify the new login accessing your account: %(name)s",
+ "What's New": "What's New",
+ "Update": "Update",
+ "What's new?": "What's new?",
+ "Restart": "Restart",
+ "Upgrade your Riot": "Upgrade your Riot",
+ "A new version of Riot is available!": "A new version of Riot is available!",
"There was an error joining the room": "There was an error joining the room",
"Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
"Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
@@ -1391,10 +1397,6 @@
"Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
"Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
"You're not currently a member of any communities.": "You're not currently a member of any communities.",
- "What's New": "What's New",
- "Update": "Update",
- "What's new?": "What's new?",
- "A new version of Riot is available.": "A new version of Riot is available.",
"Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
"Checking for an update...": "Checking for an update...",
"No update available.": "No update available.",
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
new file mode 100644
index 0000000000..3d4b55a4ff
--- /dev/null
+++ b/src/toasts/UpdateToast.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 React from "react";
+
+import { _t } from "../languageHandler";
+import GenericToast from "../components/views/toasts/GenericToast";
+import ToastStore from "../stores/ToastStore";
+import QuestionDialog from "../components/views/dialogs/QuestionDialog";
+import ChangelogDialog from "../components/views/dialogs/ChangelogDialog";
+import PlatformPeg from "../PlatformPeg";
+import Modal from "../Modal";
+
+const TOAST_KEY = "update";
+
+/*
+ * Check a version string is compatible with the Changelog
+ * dialog ([riot-version]-react-[react-sdk-version]-js-[js-sdk-version])
+ */
+function checkVersion(ver) {
+ const parts = ver.split('-');
+ return parts.length === 5 && parts[1] === 'react' && parts[3] === 'js';
+}
+
+function installUpdate() {
+ PlatformPeg.get().installUpdate();
+}
+
+export const showToast = (version: string, newVersion: string, releaseNotes?: string) => {
+ let onAccept;
+ let acceptLabel = _t("What's new?");
+ if (releaseNotes) {
+ onAccept = () => {
+ Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
+ title: _t("What's New"),
+ description:
-
- {_t("A new version of Riot is available.")}
-
- {action_button}
- {releaseNotes},
+ button: _t("Update"),
+ onFinished: (update) => {
+ if (update && PlatformPeg.get()) {
+ PlatformPeg.get().installUpdate();
+ }
+ },
+ });
+ };
+ } else if (checkVersion(version) && checkVersion(newVersion)) {
+ onAccept = () => {
+ Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
+ version,
+ newVersion,
+ onFinished: (update) => {
+ if (update && PlatformPeg.get()) {
+ PlatformPeg.get().installUpdate();
+ }
+ },
+ });
+ };
+ } else {
+ onAccept = installUpdate;
+ acceptLabel = _t("Restart");
+ }
+
+ ToastStore.sharedInstance().addOrReplaceToast({
+ key: TOAST_KEY,
+ title: _t("Upgrade your Riot"),
+ props: {
+ description: _t("A new version of Riot is available!"),
+ acceptLabel,
+ onAccept,
+ },
+ component: GenericToast,
+ priority: 20,
+ });
+};
+
+export const hideToast = () => {
+ ToastStore.sharedInstance().dismissToast(TOAST_KEY);
+};
From 41934268087fa0b9be828f1714eb4a5e3ab6f28a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 22 May 2020 23:14:33 +0100
Subject: [PATCH 11/50] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/structures/LoggedInView.tsx | 3 ---
src/components/structures/MatrixChat.tsx | 1 -
2 files changed, 4 deletions(-)
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 2a17233ec6..df21768da5 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -91,9 +91,6 @@ interface IProps {
currentUserId?: string;
currentGroupId?: string;
currentGroupIsNew?: boolean;
- version?: string;
- newVersion?: string;
- newVersionReleaseNotes?: string;
}
interface IState {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index f4d31708fe..e6db42af1d 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -226,7 +226,6 @@ export default class MatrixChat extends React.PureComponent
{headerImage}
From 0859827910a250d9d72bf16523376a13a2375323 Mon Sep 17 00:00:00 2001
From: Hubert Chathi
Date: Thu, 28 May 2020 11:56:48 -0400
Subject: [PATCH 37/50] fix types
---
src/BasePlatform.ts | 6 +++---
src/MatrixClientPeg.ts | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 14682728d0..ed04c67803 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -189,7 +189,7 @@ export default abstract class BasePlatform {
* @returns {string|null} the previously stored pickle key, or null if no
* pickle key has been stored.
*/
- async getPickleKey(userId: string, deviceId: string): string | null {
+ async getPickleKey(userId: string, deviceId: string): Promise {
return null;
}
@@ -200,7 +200,7 @@ export default abstract class BasePlatform {
* @returns {string|null} the pickle key, or null if the platform does not
* support storing pickle keys.
*/
- async createPickleKey(userId: string, deviceId: string): string | null {
+ async createPickleKey(userId: string, deviceId: string): Promise {
return null;
}
@@ -209,6 +209,6 @@ export default abstract class BasePlatform {
* @param {string} userId the user ID for the user that the pickle key is for.
* @param {string} userId the device ID that the pickle key is for.
*/
- async destroyPickleKey(userId: string, deviceId: string) {
+ async destroyPickleKey(userId: string, deviceId: string): Promise {
}
}
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index ddeff39216..e875a053b5 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -41,6 +41,7 @@ export interface IMatrixClientCreds {
deviceId: string,
accessToken: string,
guest: boolean,
+ pickleKey: string,
}
// TODO: Move this to the js-sdk
From dc4a2191c1b76b83ae4bb75f80d2de6a1c65557b Mon Sep 17 00:00:00 2001
From: Hubert Chathi
Date: Thu, 28 May 2020 12:04:32 -0400
Subject: [PATCH 38/50] really fix types
---
src/MatrixClientPeg.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index e875a053b5..c6ee6c546f 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -41,7 +41,7 @@ export interface IMatrixClientCreds {
deviceId: string,
accessToken: string,
guest: boolean,
- pickleKey: string,
+ pickleKey?: string,
}
// TODO: Move this to the js-sdk
From c4d6367a178b2df35d628e4060028fd3aa2eb93d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 28 May 2020 17:30:43 +0100
Subject: [PATCH 39/50] Swap priorities of Desktop Notifications and Update
toasts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/toasts/DesktopNotificationsToast.ts | 2 +-
src/toasts/UpdateToast.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/toasts/DesktopNotificationsToast.ts b/src/toasts/DesktopNotificationsToast.ts
index 02f0730759..413e82e20b 100644
--- a/src/toasts/DesktopNotificationsToast.ts
+++ b/src/toasts/DesktopNotificationsToast.ts
@@ -41,7 +41,7 @@ export const showToast = () => {
onReject,
},
component: GenericToast,
- priority: 20,
+ priority: 30,
});
};
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index 55c128e86a..3d4b55a4ff 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -81,7 +81,7 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
onAccept,
},
component: GenericToast,
- priority: 30,
+ priority: 20,
});
};
From 2530ec841947dacbc40db1ead96fe05041fc1219 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 28 May 2020 19:03:42 +0100
Subject: [PATCH 40/50] Try and fix the Notifier race
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/Notifier.js | 7 +------
src/components/structures/MatrixChat.tsx | 5 +++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Notifier.js b/src/Notifier.js
index cc804904e2..fac6f4e854 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -27,8 +27,7 @@ import { _t } from './languageHandler';
import Modal from './Modal';
import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
import {
- showToast as showNotificationsToast,
- hideToast as hideNotificationsToast,
+ hideToast as hideNotificationsToast, showToast as showNotificationsToast,
} from "./toasts/DesktopNotificationsToast";
/*
@@ -188,10 +187,6 @@ const Notifier = {
MatrixClientPeg.get().on("sync", this.boundOnSyncStateChange);
this.toolbarHidden = false;
this.isSyncing = false;
-
- if (this.shouldShowToolbar()) {
- showNotificationsToast();
- }
},
stop: function() {
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index fe50b80140..b70d6ed3eb 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -71,6 +71,7 @@ import {
showToast as showAnalyticsToast,
hideToast as hideAnalyticsToast
} from "../../toasts/AnalyticsToast";
+import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificationsToast";
/** constants for MatrixChat.state.view */
export enum Views {
@@ -1364,6 +1365,10 @@ export default class MatrixChat extends React.PureComponent {
this.firstSyncComplete = true;
this.firstSyncPromise.resolve();
+ if (Notifier.shouldShowToolbar()) {
+ showNotificationsToast();
+ }
+
dis.dispatch({action: 'focus_composer'});
this.setState({
ready: true,
From 227fc24d3aedba79a30eaf3963a9e9e8fefcba2a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 28 May 2020 19:04:34 +0100
Subject: [PATCH 41/50] delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/Notifier.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Notifier.js b/src/Notifier.js
index fac6f4e854..cd328ba565 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -27,7 +27,7 @@ import { _t } from './languageHandler';
import Modal from './Modal';
import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
import {
- hideToast as hideNotificationsToast, showToast as showNotificationsToast,
+ hideToast as hideNotificationsToast,
} from "./toasts/DesktopNotificationsToast";
/*
From 6559fd499e45e94059bbabfb9e59cb465e111d87 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens
Date: Thu, 28 May 2020 21:09:42 +0100
Subject: [PATCH 42/50] Fix field placeholder regression
---
src/components/views/auth/PasswordLogin.js | 2 +-
src/components/views/auth/RegistrationForm.js | 2 +-
src/components/views/elements/RoomAliasField.js | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 790c837497..3bd9b557bc 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -238,7 +238,7 @@ export default class PasswordLogin extends React.Component {
type="text"
label={_t("Phone")}
value={this.state.phoneNumber}
- prefix={phoneCountry}
+ prefixComponent={phoneCountry}
onChange={this.onPhoneNumberChanged}
onBlur={this.onPhoneNumberBlur}
disabled={this.props.disableSubmit}
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 7bbd15d8d3..17c65fa94e 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -473,7 +473,7 @@ export default createReactClass({
type="text"
label={phoneLabel}
value={this.state.phoneNumber}
- prefix={phoneCountry}
+ prefixComponent={phoneCountry}
onChange={this.onPhoneNumberChange}
onValidate={this.onPhoneNumberValidate}
/>;
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index ee18913971..04bbe1c3de 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -47,8 +47,8 @@ export default class RoomAliasField extends React.PureComponent {
this._fieldRef = ref}
onValidate={this._onValidate}
placeholder={_t("e.g. my-room")}
From ea064afca41f1f830d0c1391fa5bd78051c10478 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Fri, 29 May 2020 08:23:59 -0600
Subject: [PATCH 43/50] Fix/document a number of UIA oddities
Edition 2 of https://github.com/matrix-org/matrix-react-sdk/pull/3211
Fixes https://github.com/vector-im/riot-web/issues/13837
---
src/PasswordReset.js | 6 ++++++
.../dialogs/secretstorage/CreateSecretStorageDialog.js | 3 ++-
src/components/views/auth/InteractiveAuthEntryComponents.js | 1 +
src/components/views/settings/ChangePassword.js | 6 ++++++
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index 320599f6d9..9472ddc633 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -84,8 +84,14 @@ export default class PasswordReset {
try {
await this.client.setPassword({
+ // Note: Though this sounds like a login type for identity servers only, it
+ // has a dual purpose of being used for homeservers too.
type: "m.login.email.identity",
+ // TODO: Remove `threepid_creds` once servers support proper UIA
+ // See https://github.com/matrix-org/synapse/issues/5665
+ // See https://github.com/matrix-org/matrix-doc/issues/2220
threepid_creds: creds,
+ threepidCreds: creds,
}, this.password);
} catch (err) {
if (err.httpStatus === 401) {
diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index e6ab07c449..d7b79c2cfa 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -201,7 +201,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
type: 'm.id.user',
user: MatrixClientPeg.get().getUserId(),
},
- // https://github.com/matrix-org/synapse/issues/5665
+ // TODO: Remove `user` once servers support proper UIA
+ // See https://github.com/matrix-org/synapse/issues/5665
user: MatrixClientPeg.get().getUserId(),
password: this.state.accountPassword,
});
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 655452fcee..c6d61e38b3 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -538,6 +538,7 @@ export const MsisdnAuthEntry = createReactClass({
type: MsisdnAuthEntry.LOGIN_TYPE,
// TODO: Remove `threepid_creds` once servers support proper UIA
// See https://github.com/vector-im/riot-web/issues/10312
+ // See https://github.com/matrix-org/matrix-doc/issues/2220
threepid_creds: creds,
threepidCreds: creds,
});
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index c7eccf2145..a4ff65d8f9 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -141,6 +141,12 @@ export default createReactClass({
_changePassword: function(cli, oldPassword, newPassword) {
const authDict = {
type: 'm.login.password',
+ identifier: {
+ type: 'm.id.user',
+ user: cli.credentials.userId,
+ },
+ // TODO: Remove `user` once servers support proper UIA
+ // See https://github.com/matrix-org/synapse/issues/5665
user: cli.credentials.userId,
password: oldPassword,
};
From efd0da44a1b1fb8f58e8bdac4ea66fa77af2cc32 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 May 2020 18:24:45 +0100
Subject: [PATCH 44/50] Give contextual feedback for manual update check
instead of banner
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.eslintignore.errorfiles | 1 -
res/css/_components.scss | 2 +-
res/css/structures/_MatrixChat.scss | 4 -
res/css/views/globals/_MatrixToolbar.scss | 69 --------------
.../views/settings/_UpdateCheckButton.scss | 23 +++++
src/BasePlatform.ts | 24 +++++
src/components/structures/LoggedInView.tsx | 20 ----
src/components/structures/MatrixChat.tsx | 6 --
.../views/globals/UpdateCheckBar.js | 91 -------------------
.../views/settings/UpdateCheckButton.tsx | 90 ++++++++++++++++++
.../settings/tabs/user/HelpUserSettingsTab.js | 8 +-
src/dispatcher/actions.ts | 7 +-
.../payloads/CheckUpdatesPayload.ts | 33 +++++++
src/hooks/useDispatcher.ts | 40 ++++++++
src/i18n/strings/en_EN.json | 11 ++-
src/utils/ResizeNotifier.js | 5 -
16 files changed, 225 insertions(+), 209 deletions(-)
delete mode 100644 res/css/views/globals/_MatrixToolbar.scss
create mode 100644 res/css/views/settings/_UpdateCheckButton.scss
delete mode 100644 src/components/views/globals/UpdateCheckBar.js
create mode 100644 src/components/views/settings/UpdateCheckButton.tsx
create mode 100644 src/dispatcher/payloads/CheckUpdatesPayload.ts
create mode 100644 src/hooks/useDispatcher.ts
diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index ffc3b21181..7e88ebff7f 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -16,7 +16,6 @@ src/components/views/elements/MemberEventListSummary.js
src/components/views/elements/UserSelector.js
src/components/views/globals/MatrixToolbar.js
src/components/views/globals/NewVersionBar.js
-src/components/views/globals/UpdateCheckBar.js
src/components/views/messages/MFileBody.js
src/components/views/messages/TextualBody.js
src/components/views/room_settings/ColorSettings.js
diff --git a/res/css/_components.scss b/res/css/_components.scss
index 44c63b9df7..bcf7b97683 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -123,7 +123,6 @@
@import "./views/elements/_TooltipButton.scss";
@import "./views/elements/_Validation.scss";
@import "./views/emojipicker/_EmojiPicker.scss";
-@import "./views/globals/_MatrixToolbar.scss";
@import "./views/groups/_GroupPublicityToggle.scss";
@import "./views/groups/_GroupRoomList.scss";
@import "./views/groups/_GroupUserSettings.scss";
@@ -202,6 +201,7 @@
@import "./views/settings/_ProfileSettings.scss";
@import "./views/settings/_SetIdServer.scss";
@import "./views/settings/_SetIntegrationManager.scss";
+@import "./views/settings/_UpdateCheckButton.scss";
@import "./views/settings/tabs/_SettingsTab.scss";
@import "./views/settings/tabs/room/_GeneralRoomSettingsTab.scss";
@import "./views/settings/tabs/room/_RolesRoomSettingsTab.scss";
diff --git a/res/css/structures/_MatrixChat.scss b/res/css/structures/_MatrixChat.scss
index c5a5d50068..05c703ab6d 100644
--- a/res/css/structures/_MatrixChat.scss
+++ b/res/css/structures/_MatrixChat.scss
@@ -41,10 +41,6 @@ limitations under the License.
height: 40px;
}
-.mx_MatrixChat_toolbarShowing {
- height: auto;
-}
-
.mx_MatrixChat {
width: 100%;
height: 100%;
diff --git a/res/css/views/globals/_MatrixToolbar.scss b/res/css/views/globals/_MatrixToolbar.scss
deleted file mode 100644
index 07b92a7235..0000000000
--- a/res/css/views/globals/_MatrixToolbar.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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.
-*/
-
-.mx_MatrixToolbar {
- background-color: $accent-color;
- color: $accent-fg-color;
-
- display: flex;
- align-items: center;
-}
-
-.mx_MatrixToolbar_warning {
- margin-left: 16px;
- margin-right: 8px;
- margin-top: -2px;
-}
-
-.mx_MatrixToolbar_info {
- padding-left: 16px;
- padding-right: 8px;
- background-color: $info-bg-color;
-}
-
-.mx_MatrixToolbar_error {
- padding-left: 16px;
- padding-right: 8px;
- background-color: $warning-bg-color;
-}
-
-.mx_MatrixToolbar_content {
- flex: 1;
-}
-
-.mx_MatrixToolbar_link {
- color: $accent-fg-color !important;
- text-decoration: underline !important;
- cursor: pointer;
-}
-
-.mx_MatrixToolbar_clickable {
- cursor: pointer;
-}
-
-.mx_MatrixToolbar_close {
- cursor: pointer;
-}
-
-.mx_MatrixToolbar_close img {
- display: block;
- float: right;
- margin-right: 10px;
-}
-
-.mx_MatrixToolbar_action {
- margin-right: 16px;
-}
diff --git a/res/css/views/settings/_UpdateCheckButton.scss b/res/css/views/settings/_UpdateCheckButton.scss
new file mode 100644
index 0000000000..f35a023ac1
--- /dev/null
+++ b/res/css/views/settings/_UpdateCheckButton.scss
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+
+.mx_UpdateCheckButton_summary {
+ margin-left: 16px;
+
+ .mx_AccessibleButton_kind_link {
+ padding: 0;
+ }
+}
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index ed04c67803..0465b434d0 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -21,6 +21,16 @@ import {MatrixClient} from "matrix-js-sdk/src/client";
import dis from './dispatcher/dispatcher';
import BaseEventIndexManager from './indexing/BaseEventIndexManager';
import {ActionPayload} from "./dispatcher/payloads";
+import {CheckUpdatesPayload} from "./dispatcher/payloads/CheckUpdatesPayload";
+import {Action} from "./dispatcher/actions";
+
+export enum UpdateCheckStatus {
+ Checking = "CHECKING",
+ Error = "ERROR",
+ NotAvailable = "NOTAVAILABLE",
+ Downloading = "DOWNLOADING",
+ Ready = "READY",
+}
/**
* Base class for classes that provide platform-specific functionality
@@ -56,6 +66,20 @@ export default abstract class BasePlatform {
this.errorDidOccur = errorDidOccur;
}
+ /**
+ * Whether we can call checkForUpdate on this platform build
+ */
+ async canSelfUpdate(): Promise {
+ return false;
+ }
+
+ startUpdateCheck() {
+ dis.dispatch({
+ action: Action.CheckUpdates,
+ status: UpdateCheckStatus.Checking,
+ });
+ }
+
/**
* Returns true if the platform supports displaying
* notifications, otherwise false.
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 06ba3e49c9..1ad38c6f04 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -81,7 +81,6 @@ interface IProps {
currentRoomId: string;
ConferenceHandler?: object;
collapseLhs: boolean;
- checkingForUpdate: boolean;
config: {
piwik: {
policyUrl: string;
@@ -177,15 +176,6 @@ class LoggedInView extends React.PureComponent {
this._loadResizerPreferences();
}
- componentDidUpdate(prevProps, prevState) {
- // attempt to guess when a banner was opened or closed
- if (
- (prevProps.checkingForUpdate !== this.props.checkingForUpdate)
- ) {
- this.props.resizeNotifier.notifyBannersChanged();
- }
- }
-
componentWillUnmount() {
document.removeEventListener('keydown', this._onNativeKeyDown, false);
this._matrixClient.removeListener("accountData", this.onAccountData);
@@ -617,7 +607,6 @@ class LoggedInView extends React.PureComponent {
const GroupView = sdk.getComponent('structures.GroupView');
const MyGroups = sdk.getComponent('structures.MyGroups');
const ToastContainer = sdk.getComponent('structures.ToastContainer');
- const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
let pageElement;
@@ -661,15 +650,7 @@ class LoggedInView extends React.PureComponent {
break;
}
- let topBar;
- if (this.props.checkingForUpdate) {
- topBar = {
onMouseDown={this._onMouseDown}
onMouseUp={this._onMouseUp}
>
- { topBar }
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index b70d6ed3eb..058a7ba50b 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -173,7 +173,6 @@ interface IState {
leftDisabled: boolean;
middleDisabled: boolean;
// the right panel's disabled state is tracked in its store.
- checkingForUpdate?: string; // updateCheckStatusEnum
// Parameters used in the registration dance with the IS
register_client_secret?: string;
register_session_id?: string;
@@ -226,8 +225,6 @@ export default class MatrixChat extends React.PureComponent {
leftDisabled: false,
middleDisabled: false,
- checkingForUpdate: null,
-
hideToSRUsers: false,
syncError: null, // If the current syncing status is ERROR, the error object, otherwise null.
@@ -720,9 +717,6 @@ export default class MatrixChat extends React.PureComponent {
case 'client_started':
this.onClientStarted();
break;
- case 'check_updates':
- this.setState({ checkingForUpdate: payload.value });
- break;
case 'send_event':
this.onSendEvent(payload.room_id, payload.event);
break;
diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js
deleted file mode 100644
index 32b38ff5b0..0000000000
--- a/src/components/views/globals/UpdateCheckBar.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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 React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import { _t } from '../../../languageHandler';
-import PlatformPeg from '../../../PlatformPeg';
-import AccessibleButton from '../../../components/views/elements/AccessibleButton';
-
-export default createReactClass({
- propTypes: {
- status: PropTypes.string.isRequired,
- // Currently for error detail but will be usable for download progress
- // once that is a thing that squirrel passes through electron.
- detail: PropTypes.string,
- },
-
- getDefaultProps: function() {
- return {
- detail: '',
- };
- },
-
- getStatusText: function() {
- // we can't import the enum from riot-web as we don't want matrix-react-sdk
- // to depend on riot-web. so we grab it as a normal object via API instead.
- const updateCheckStatusEnum = PlatformPeg.get().getUpdateCheckStatusEnum();
- switch (this.props.status) {
- case updateCheckStatusEnum.ERROR:
- return _t('Error encountered (%(errorDetail)s).', { errorDetail: this.props.detail });
- case updateCheckStatusEnum.CHECKING:
- return _t('Checking for an update...');
- case updateCheckStatusEnum.NOTAVAILABLE:
- return _t('No update available.');
- case updateCheckStatusEnum.DOWNLOADING:
- return _t('Downloading update...');
- }
- },
-
- hideToolbar: function() {
- PlatformPeg.get().stopUpdateCheck();
- },
-
- render: function() {
- const message = this.getStatusText();
- const warning = _t('Warning');
-
- if (!('getUpdateCheckStatusEnum' in PlatformPeg.get())) {
- return ;
- }
-
- const updateCheckStatusEnum = PlatformPeg.get().getUpdateCheckStatusEnum();
- const doneStatuses = [
- updateCheckStatusEnum.ERROR,
- updateCheckStatusEnum.NOTAVAILABLE,
- ];
-
- let image;
- if (doneStatuses.includes(this.props.status)) {
- image = ;
- } else {
- image = ![]({require("../../../../res/img/spinner.gif")})
;
- }
-
- return (
- {sub}
+ });
+ }
+}
+
+const doneStatuses = [
+ UpdateCheckStatus.Ready,
+ UpdateCheckStatus.Error,
+ UpdateCheckStatus.NotAvailable,
+];
+
+const UpdateCheckButton = () => {
+ const [state, setState] = useState(null);
+
+ const onCheckForUpdateClick = () => {
+ setState(null);
+ PlatformPeg.get().startUpdateCheck();
+ hideUpdateToast();
+ };
+
+ useDispatcher(dis, ({action, ...params}) => {
+ if (action === Action.CheckUpdates) {
+ setState(params as CheckUpdatesPayload);
+ }
+ });
+
+ const busy = state && !doneStatuses.includes(state.status);
+
+ let suffix;
+ if (state) {
+ suffix =
+ {getStatusText(state.status, state.detail)}
+ {busy &&
+
+ {_t("Check for update")}
+
+ { suffix }
+ ;
+};
+
+export default UpdateCheckButton;
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index 146d841d58..bec79b97c4 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -25,6 +25,7 @@ import Modal from "../../../../../Modal";
import * as sdk from "../../../../../";
import PlatformPeg from "../../../../../PlatformPeg";
import * as KeyboardShortcuts from "../../../../../accessibility/KeyboardShortcuts";
+import UpdateCheckButton from "../../UpdateCheckButton";
export default class HelpUserSettingsTab extends React.Component {
static propTypes = {
@@ -177,12 +178,7 @@ export default class HelpUserSettingsTab extends React.Component {
let updateButton = null;
if (this.state.canUpdate) {
- const platform = PlatformPeg.get();
- updateButton = (
-
- {_t('Check for update')}
-
- );
+ updateButton = , handler: (payload: ActionPayload) => void) => {
+ // Create a ref that stores handler
+ const savedHandler = useRef((payload: ActionPayload) => {});
+
+ // Update ref.current value if handler changes.
+ useEffect(() => {
+ savedHandler.current = handler;
+ }, [handler]);
+
+ useEffect(() => {
+ // Create event listener that calls handler function stored in ref
+ const ref = dispatcher.register((payload) => savedHandler.current(payload));
+ // Remove event listener on cleanup
+ return () => {
+ dispatcher.unregister(ref);
+ };
+ }, [dispatcher]);
+};
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ba55ee9d64..8f7e8ea6b6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -772,6 +772,12 @@
"Use an Integration Manager to manage bots, widgets, and sticker packs.": "Use an Integration Manager to manage bots, widgets, and sticker packs.",
"Manage integrations": "Manage integrations",
"Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.": "Integration Managers receive configuration data, and can modify widgets, send room invites, and set power levels on your behalf.",
+ "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
+ "Checking for an update...": "Checking for an update...",
+ "No update available.": "No update available.",
+ "Downloading update...": "Downloading update...",
+ "New version available. Update now.": "New version available. Update now.",
+ "Check for update": "Check for update",
"Size must be a number": "Size must be a number",
"Custom font size can only be between %(min)s pt and %(max)s pt": "Custom font size can only be between %(min)s pt and %(max)s pt",
"Use between %(min)s pt and %(max)s pt": "Use between %(min)s pt and %(max)s pt",
@@ -804,7 +810,6 @@
"For help with using Riot, click here.": "For help with using Riot, click here.",
"For help with using Riot, click here or start a chat with our bot using the button below.": "For help with using Riot, click here or start a chat with our bot using the button below.",
"Chat with Riot Bot": "Chat with Riot Bot",
- "Check for update": "Check for update",
"Help & About": "Help & About",
"Bug reporting": "Bug reporting",
"If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
@@ -1397,10 +1402,6 @@
"Something went wrong when trying to get your communities.": "Something went wrong when trying to get your communities.",
"Display your community flair in rooms configured to show it.": "Display your community flair in rooms configured to show it.",
"You're not currently a member of any communities.": "You're not currently a member of any communities.",
- "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
- "Checking for an update...": "Checking for an update...",
- "No update available.": "No update available.",
- "Downloading update...": "Downloading update...",
"Frequently Used": "Frequently Used",
"Smileys & People": "Smileys & People",
"Animals & Nature": "Animals & Nature",
diff --git a/src/utils/ResizeNotifier.js b/src/utils/ResizeNotifier.js
index 35ec1a0269..d65bc4bd07 100644
--- a/src/utils/ResizeNotifier.js
+++ b/src/utils/ResizeNotifier.js
@@ -29,11 +29,6 @@ export default class ResizeNotifier extends EventEmitter {
this._throttledMiddlePanel = throttle(() => this.emit("middlePanelResized"), 200);
}
- notifyBannersChanged() {
- this.emit("leftPanelResized");
- this.emit("middlePanelResized");
- }
-
// can be called in quick succession
notifyLeftHandleResized() {
// don't emit event for own region
From f45c584c8a1993d045373e047bb1af300f14f18d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 May 2020 19:13:59 +0100
Subject: [PATCH 45/50] Correct the GenericToast props to show the two modes of
operation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/@types/common.ts | 19 +++++++++++++++++++
src/components/views/toasts/GenericToast.tsx | 10 +++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 src/@types/common.ts
diff --git a/src/@types/common.ts b/src/@types/common.ts
new file mode 100644
index 0000000000..26e5317aa3
--- /dev/null
+++ b/src/@types/common.ts
@@ -0,0 +1,19 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+
+// Based on https://stackoverflow.com/a/53229857/3532235
+export type Without = {[P in Exclude] ? : never}
+export type XOR = (T | U) extends object ? (Without & U) | (Without & T) : T | U;
diff --git a/src/components/views/toasts/GenericToast.tsx b/src/components/views/toasts/GenericToast.tsx
index 9d69330857..ea12641948 100644
--- a/src/components/views/toasts/GenericToast.tsx
+++ b/src/components/views/toasts/GenericToast.tsx
@@ -17,17 +17,21 @@ limitations under the License.
import React, {ReactChild} from "react";
import FormButton from "../elements/FormButton";
+import {XOR} from "../../../@types/common";
interface IProps {
description: ReactChild;
acceptLabel: string;
- rejectLabel?: string;
onAccept();
- onReject?();
}
-const GenericToast: React.FC = ({description, acceptLabel, rejectLabel, onAccept, onReject}) => {
+interface IPropsExtended extends IProps {
+ rejectLabel: string;
+ onReject();
+}
+
+const GenericToast: React.FC> = ({description, acceptLabel, rejectLabel, onAccept, onReject}) => {
return
;
- } else {
- image = ;
- }
-
- return (
-
- {image}
-
-
-
-
- );
- },
-});
diff --git a/src/components/views/settings/UpdateCheckButton.tsx b/src/components/views/settings/UpdateCheckButton.tsx
new file mode 100644
index 0000000000..3f7c11dfc8
--- /dev/null
+++ b/src/components/views/settings/UpdateCheckButton.tsx
@@ -0,0 +1,90 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 React, {useState} from "react";
+
+import {UpdateCheckStatus} from "../../../BasePlatform";
+import PlatformPeg from "../../../PlatformPeg";
+import {hideToast as hideUpdateToast} from "../../../toasts/UpdateToast";
+import {useDispatcher} from "../../../hooks/useDispatcher";
+import dis from "../../../dispatcher/dispatcher";
+import {Action} from "../../../dispatcher/actions";
+import {_t} from "../../../languageHandler";
+import InlineSpinner from "../../../components/views/elements/InlineSpinner";
+import AccessibleButton from "../../../components/views/elements/AccessibleButton";
+import {CheckUpdatesPayload} from "../../../dispatcher/payloads/CheckUpdatesPayload";
+
+function installUpdate() {
+ PlatformPeg.get().installUpdate();
+}
+
+function getStatusText(status: UpdateCheckStatus, errorDetail?: string) {
+ switch (status) {
+ case UpdateCheckStatus.Error:
+ return _t('Error encountered (%(errorDetail)s).', { errorDetail });
+ case UpdateCheckStatus.Checking:
+ return _t('Checking for an update...');
+ case UpdateCheckStatus.NotAvailable:
+ return _t('No update available.');
+ case UpdateCheckStatus.Downloading:
+ return _t('Downloading update...');
+ case UpdateCheckStatus.Ready:
+ return _t("New version available. Update now.", {}, {
+ a: sub =>
- {message}
-
-
-
{ description }
From 9431393bdaa107be1505a698963ac79eba25e917 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 May 2020 19:59:47 +0100
Subject: [PATCH 46/50] Allow deferring of Update Toast until the next morning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/BasePlatform.ts | 36 +++++++++++++++++++
.../views/settings/UpdateCheckButton.tsx | 2 --
src/toasts/UpdateToast.tsx | 6 ++++
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index 0465b434d0..c5f58f7f0c 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -23,6 +23,7 @@ import BaseEventIndexManager from './indexing/BaseEventIndexManager';
import {ActionPayload} from "./dispatcher/payloads";
import {CheckUpdatesPayload} from "./dispatcher/payloads/CheckUpdatesPayload";
import {Action} from "./dispatcher/actions";
+import {hideToast as hideUpdateToast} from "./toasts/UpdateToast";
export enum UpdateCheckStatus {
Checking = "CHECKING",
@@ -32,6 +33,8 @@ export enum UpdateCheckStatus {
Ready = "READY",
}
+const UPDATE_DEFER_KEY = "mx_defer_update";
+
/**
* Base class for classes that provide platform-specific functionality
* eg. Setting an application badge or displaying notifications
@@ -74,12 +77,45 @@ export default abstract class BasePlatform {
}
startUpdateCheck() {
+ hideUpdateToast();
+ localStorage.removeItem(UPDATE_DEFER_KEY);
dis.dispatch({
action: Action.CheckUpdates,
status: UpdateCheckStatus.Checking,
});
}
+ /**
+ * Update the currently running app to the latest available version
+ * and replace this instance of the app with the new version.
+ */
+ installUpdate() {
+ }
+
+ /**
+ * Check if the version update has been deferred and that deferment is still in effect
+ * @param newVersion the version string to check
+ */
+ protected shouldShowUpdate(newVersion: string): boolean {
+ try {
+ const [version, deferUntil] = JSON.parse(localStorage.getItem(UPDATE_DEFER_KEY));
+ return newVersion !== version || Date.now() > deferUntil;
+ } catch (e) {
+ return true;
+ }
+ }
+
+ /**
+ * Ignore the pending update and don't prompt about this version
+ * until the next morning (8am).
+ */
+ deferUpdate(newVersion: string) {
+ const date = new Date(Date.now() + 24 * 60 * 60 * 1000);
+ date.setHours(8, 0, 0, 0); // set to next 8am
+ localStorage.setItem(UPDATE_DEFER_KEY, JSON.stringify([newVersion, date.getTime()]));
+ hideUpdateToast();
+ }
+
/**
* Returns true if the platform supports displaying
* notifications, otherwise false.
diff --git a/src/components/views/settings/UpdateCheckButton.tsx b/src/components/views/settings/UpdateCheckButton.tsx
index 3f7c11dfc8..10e0e29f31 100644
--- a/src/components/views/settings/UpdateCheckButton.tsx
+++ b/src/components/views/settings/UpdateCheckButton.tsx
@@ -18,7 +18,6 @@ import React, {useState} from "react";
import {UpdateCheckStatus} from "../../../BasePlatform";
import PlatformPeg from "../../../PlatformPeg";
-import {hideToast as hideUpdateToast} from "../../../toasts/UpdateToast";
import {useDispatcher} from "../../../hooks/useDispatcher";
import dis from "../../../dispatcher/dispatcher";
import {Action} from "../../../dispatcher/actions";
@@ -60,7 +59,6 @@ const UpdateCheckButton = () => {
const onCheckForUpdateClick = () => {
setState(null);
PlatformPeg.get().startUpdateCheck();
- hideUpdateToast();
};
useDispatcher(dis, ({action, ...params}) => {
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index 3d4b55a4ff..7a8d3671db 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -40,6 +40,10 @@ function installUpdate() {
}
export const showToast = (version: string, newVersion: string, releaseNotes?: string) => {
+ function onReject() {
+ PlatformPeg.get().deferUpdate(newVersion);
+ }
+
let onAccept;
let acceptLabel = _t("What's new?");
if (releaseNotes) {
@@ -79,6 +83,8 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
description: _t("A new version of Riot is available!"),
acceptLabel,
onAccept,
+ rejectLabel: _t("Later"),
+ onReject,
},
component: GenericToast,
priority: 20,
From 0bbf971bac5e2c47909a84d9d95418ee3ce9ca2d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 29 May 2020 20:50:47 +0100
Subject: [PATCH 47/50] Update src/dispatcher/actions.ts
Co-authored-by: Travis Ralston
---
src/dispatcher/actions.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index c1d6fd5c54..7e76ea5ccb 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -50,8 +50,7 @@ export enum Action {
RecheckTheme = "recheck_theme",
/**
- * Response to manual update check, will fire multiple times during the update check.
+ * Provide status information for an ongoing update check. Should be used with a CheckUpdatesPayload.
*/
CheckUpdates = "check_updates",
}
-
From f3fedc5fc4f8315a83ed46ab3891eb25b7ab8e39 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 30 May 2020 00:42:23 +0100
Subject: [PATCH 48/50] fix url
---
code_style.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code_style.md b/code_style.md
index 01c1f37146..8c8e40fa18 100644
--- a/code_style.md
+++ b/code_style.md
@@ -4,7 +4,7 @@ Matrix JavaScript/ECMAScript Style Guide
The intention of this guide is to make Matrix's JavaScript codebase clean,
consistent with other popular JavaScript styles and consistent with the rest of
the Matrix codebase. For reference, the Matrix Python style guide can be found
-at https://github.com/matrix-org/synapse/blob/master/docs/code_style.rst
+at https://github.com/matrix-org/synapse/blob/master/docs/code_style.md
This document reflects how we would like Matrix JavaScript code to look, with
acknowledgement that a significant amount of code is written to older
From 7750c95a028b8703fd9b4a685b08d599cdede3af Mon Sep 17 00:00:00 2001
From: Matthew Hodgson
Date: Sat, 30 May 2020 00:43:55 +0100
Subject: [PATCH 49/50] typoe
---
code_style.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code_style.md b/code_style.md
index 8c8e40fa18..fe04d2cc3d 100644
--- a/code_style.md
+++ b/code_style.md
@@ -17,7 +17,7 @@ writing in modern ECMAScript and using a transpile step to generate the file
that applications can then include. There are significant benefits in being
able to use modern ECMAScript, although the tooling for doing so can be awkward
for library code, especially with regard to translating source maps and line
-number throgh from the original code to the final application.
+number through from the original code to the final application.
General Style
-------------
From 5b31fdd30846c7b3d56c08ecabc09d56584188ec Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 30 May 2020 12:36:17 +0100
Subject: [PATCH 50/50] remove stale references to MatrixToolbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
.eslintignore.errorfiles | 1 -
test/skinned-sdk.js | 1 -
2 files changed, 2 deletions(-)
diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 7e88ebff7f..db12611ade 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -14,7 +14,6 @@ src/components/views/elements/AddressSelector.js
src/components/views/elements/DirectorySearchBox.js
src/components/views/elements/MemberEventListSummary.js
src/components/views/elements/UserSelector.js
-src/components/views/globals/MatrixToolbar.js
src/components/views/globals/NewVersionBar.js
src/components/views/messages/MFileBody.js
src/components/views/messages/TextualBody.js
diff --git a/test/skinned-sdk.js b/test/skinned-sdk.js
index bc13d78815..876a188cc0 100644
--- a/test/skinned-sdk.js
+++ b/test/skinned-sdk.js
@@ -16,7 +16,6 @@ const components = {};
components['structures.LeftPanel'] = stubComponent();
components['structures.RightPanel'] = stubComponent();
components['structures.RoomDirectory'] = stubComponent();
-components['views.globals.MatrixToolbar'] = stubComponent();
components['views.globals.GuestWarningBar'] = stubComponent();
components['views.globals.NewVersionBar'] = stubComponent();
components['views.elements.Spinner'] = stubComponent({displayName: 'Spinner'});