diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 33f1bac090..bf2e7beb16 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -50,7 +50,6 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore"; import { startAnyRegistrationFlow } from "../../Registration.js"; import { messageForSyncError } from '../../utils/ErrorUtils'; import ResizeNotifier from "../../utils/ResizeNotifier"; -import TimelineExplosionDialog from "../views/dialogs/TimelineExplosionDialog"; const AutoDiscovery = Matrix.AutoDiscovery; @@ -1307,17 +1306,6 @@ export default React.createClass({ return self._loggedInView.child.canResetTimelineInRoom(roomId); }); - cli.on('sync.unexpectedError', function(err) { - if (err.message && err.message.includes("live timeline ") && err.message.includes(" is no longer live ")) { - console.error("Caught timeline explosion - trying to ask user for more information"); - if (Modal.hasDialogs()) { - console.warn("User has another dialog open - skipping prompt"); - return; - } - Modal.createTrackedDialog('Timeline exploded', '', TimelineExplosionDialog, {}); - } - }); - cli.on('sync', function(state, prevState, data) { // LifecycleStore and others cannot directly subscribe to matrix client for // events because flux only allows store state changes during flux dispatches. diff --git a/src/components/views/dialogs/TimelineExplosionDialog.js b/src/components/views/dialogs/TimelineExplosionDialog.js deleted file mode 100644 index 6e810d0421..0000000000 --- a/src/components/views/dialogs/TimelineExplosionDialog.js +++ /dev/null @@ -1,130 +0,0 @@ -/* -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 sdk from '../../../index'; -import SdkConfig from '../../../SdkConfig'; -import { _t } from '../../../languageHandler'; - -// Dev note: this should be a temporary dialog while we work out what is -// actually going on. See https://github.com/vector-im/riot-web/issues/8593 -// for more details. This dialog is almost entirely a copy/paste job of -// BugReportDialog. -export default class TimelineExplosionDialog extends React.Component { - static propTypes = { - onFinished: React.PropTypes.func.isRequired, - }; - - constructor(props, context) { - super(props, context); - this.state = { - busy: false, - progress: null, - }; - } - - _onCancel() { - console.log("Reloading without sending logs for timeline explosion"); - window.location.reload(); - } - - _onSubmit = () => { - const userText = "Caught timeline explosion\n\nhttps://github.com/vector-im/riot-web/issues/8593"; - - this.setState({busy: true, progress: null}); - this._sendProgressCallback(_t("Preparing to send logs")); - - require(['../../../rageshake/submit-rageshake'], (s) => { - s(SdkConfig.get().bug_report_endpoint_url, { - userText, - sendLogs: true, - progressCallback: this._sendProgressCallback, - }).then(() => { - console.log("Logs sent for timeline explosion - reloading Riot"); - window.location.reload(); - }, (err) => { - console.error("Error sending logs for timeline explosion - reloading anyways.", err); - window.location.reload(); - }); - }); - }; - - _sendProgressCallback = (progress) => { - this.setState({progress: progress}); - }; - - render() { - const Loader = sdk.getComponent("elements.Spinner"); - const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); - const DialogButtons = sdk.getComponent('views.elements.DialogButtons'); - - let progress = null; - if (this.state.busy) { - progress = ( -
- {this.state.progress} ... - -
- ); - } - - return ( - -
-

- {_t( - "Riot has run into a problem which makes it difficult to show you " + - "your messages right now. Nothing has been lost and reloading the app " + - "should fix this for you. In order to assist us in troubleshooting the " + - "problem, we'd like to take a look at your debug logs. You do not need " + - "to send your logs unless you want to, but we would really appreciate " + - "it if you did. We'd also like to apologize for having to show this " + - "message to you - we hope your debug logs are the key to solving the " + - "issue once and for all. If you'd like more information on the bug you've " + - "accidentally run into, please visit the issue.", - {}, - { - 'a': (sub) => { - return {sub}; - }, - }, - )} -

-

- {_t( - "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.", - )} -

- {progress} -
- - - ); - } -} - diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5cfb61d60b..deca0737eb 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1210,10 +1210,6 @@ "Missing session data": "Missing session data", "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.", "Your browser likely removed this data when running low on disk space.": "Your browser likely removed this data when running low on disk space.", - "Error showing you your room": "Error showing you your room", - "Riot has run into a problem which makes it difficult to show you your messages right now. Nothing has been lost and reloading the app should fix this for you. In order to assist us in troubleshooting the problem, we'd like to take a look at your debug logs. You do not need to send your logs unless you want to, but we would really appreciate it if you did. We'd also like to apologize for having to show this message to you - we hope your debug logs are the key to solving the issue once and for all. If you'd like more information on the bug you've accidentally run into, please visit the issue.": "Riot has run into a problem which makes it difficult to show you your messages right now. Nothing has been lost and reloading the app should fix this for you. In order to assist us in troubleshooting the problem, we'd like to take a look at your debug logs. You do not need to send your logs unless you want to, but we would really appreciate it if you did. We'd also like to apologize for having to show this message to you - we hope your debug logs are the key to solving the issue once and for all. If you'd like more information on the bug you've accidentally run into, please visit the issue.", - "Send debug logs and reload Riot": "Send debug logs and reload Riot", - "Reload Riot without sending logs": "Reload Riot without sending logs", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", "Room contains unknown devices": "Room contains unknown devices",