{_t(
"Please confirm that you'd like to go forward with upgrading this room " +
- "from {room ? room.getVersion() : "1"},
diff --git a/src/components/structures/GenericErrorPage.js b/src/components/structures/GenericErrorPage.js
new file mode 100644
index 0000000000..f28f66064c
--- /dev/null
+++ b/src/components/structures/GenericErrorPage.js
@@ -0,0 +1,38 @@
+/*
+Copyright 2019 New Vector 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.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {_t} from "../../languageHandler";
+
+export default class GenericErrorPage extends React.PureComponent {
+ static propTypes = {
+ message: PropTypes.string.isRequired,
+ };
+
+ render() {
+ return
{this.props.message}
+{_t( + "If this is unexpected, please contact your system administrator " + + "or technical support representative.", + )}
+{encryptedMessageAreEncrypted}
{_t( - "This device is not backing up your keys.", {}, + "This device is not backing up your keys, " + + "but you do have an existing backup you can restore from " + + "and add to going forward.", {}, {b: sub => {sub}}, )}
-{_t("Back up your keys before signing out to avoid losing them.")}
+{_t( + "Connect this device to key backup before signing out to avoid " + + "losing any keys that may only be on this device.", + )}
\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n": "\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n", "Add rooms to the community summary": "Add rooms to the community summary", "Which rooms would you like to add to this summary?": "Which rooms would you like to add to this summary?", @@ -1487,7 +1492,12 @@ "Return to login screen": "Return to login screen", "Set a new password": "Set a new password", "Invalid homeserver discovery response": "Invalid homeserver discovery response", + "Failed to get autodiscovery configuration from server": "Failed to get autodiscovery configuration from server", + "Invalid base_url for m.homeserver": "Invalid base_url for m.homeserver", + "Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver URL does not appear to be a valid Matrix homeserver", "Invalid identity server discovery response": "Invalid identity server discovery response", + "Invalid base_url for m.identity_server": "Invalid base_url for m.identity_server", + "Identity server URL does not appear to be a valid identity server": "Identity server URL does not appear to be a valid identity server", "General failure": "General failure", "This homeserver does not support login using email address.": "This homeserver does not support login using email address.", "Please contact your service administrator to continue using this service.": "Please contact your service administrator to continue using this service.", diff --git a/src/matrix-to.js b/src/matrix-to.js index bb7ddfbd94..a198bb422e 100644 --- a/src/matrix-to.js +++ b/src/matrix-to.js @@ -77,6 +77,7 @@ export class RoomPermalinkCreator { this._bannedHostsRegexps = null; this._allowedHostsRegexps = null; this._serverCandidates = null; + this._started = false; this.onMembership = this.onMembership.bind(this); this.onRoomState = this.onRoomState.bind(this); @@ -101,11 +102,17 @@ export class RoomPermalinkCreator { this.load(); this._room.on("RoomMember.membership", this.onMembership); this._room.on("RoomState.events", this.onRoomState); + this._started = true; } stop() { this._room.removeListener("RoomMember.membership", this.onMembership); this._room.removeListener("RoomState.events", this.onRoomState); + this._started = false; + } + + isStarted() { + return this._started; } forEvent(eventId) { diff --git a/src/settings/Settings.js b/src/settings/Settings.js index dcd6f91aef..35baa718b9 100644 --- a/src/settings/Settings.js +++ b/src/settings/Settings.js @@ -262,13 +262,6 @@ export const SETTINGS = { supportedLevels: ['account'], default: [], }, - "breadcrumb_scroll_tolerances": { - supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS, - default: { - xyThreshold: 10, - yReduction: 0.8, - }, - }, "analyticsOptIn": { supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG, displayName: _td('Send analytics data'),