diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 0b0b714f..7c55fb25 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -2317,7 +2317,7 @@ "readUpToHere": "Read up to here", "jump": "Jump", "openLinkInBrowser": "Open link in browser", - "reportErrorDescription": "Oh no. Something went wrong. Please try again later. If you want, you can report the bug to the developers.", + "reportErrorDescription": "😭 Oh no. Something went wrong. If you want, you can report this bug to the developers.", "report": "report", "signInWithPassword": "Sign in with password", "pleaseTryAgainLaterOrChooseDifferentServer": "Please try again later or choose a different server.", diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index e4cccd6b..1dec67f7 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -219,18 +219,7 @@ class ChatController extends State { void requestHistory([_]) async { if (!timeline!.canRequestHistory) return; Logs().v('Requesting history...'); - try { - await timeline!.requestHistory(historyCount: _loadHistoryCount); - } catch (err) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - (err).toLocalizedString(context), - ), - ), - ); - rethrow; - } + await timeline!.requestHistory(historyCount: _loadHistoryCount); } void requestFuture() async { @@ -238,20 +227,9 @@ class ChatController extends State { if (timeline == null) return; if (!timeline.canRequestFuture) return; Logs().v('Requesting future...'); - try { - final mostRecentEventId = timeline.events.first.eventId; - await timeline.requestFuture(historyCount: _loadHistoryCount); - setReadMarker(eventId: mostRecentEventId); - } catch (err) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - (err).toLocalizedString(context), - ), - ), - ); - rethrow; - } + final mostRecentEventId = timeline.events.first.eventId; + await timeline.requestFuture(historyCount: _loadHistoryCount); + setReadMarker(eventId: mostRecentEventId); } void _updateScrollController() { diff --git a/lib/utils/error_reporter.dart b/lib/utils/error_reporter.dart index 3f8a003d..26fe5830 100644 --- a/lib/utils/error_reporter.dart +++ b/lib/utils/error_reporter.dart @@ -9,7 +9,6 @@ import 'package:matrix/matrix.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/utils/localized_exception_extension.dart'; import 'package:fluffychat/utils/platform_infos.dart'; class ErrorReporter { @@ -22,8 +21,8 @@ class ErrorReporter { Logs().e(message ?? 'Error caught', error, stackTrace); final consent = await showOkCancelAlertDialog( context: context, - title: error.toLocalizedString(context), - message: L10n.of(context)!.reportErrorDescription, + title: L10n.of(context)!.reportErrorDescription, + message: '$error\n${stackTrace ?? ''}', okLabel: L10n.of(context)!.report, cancelLabel: L10n.of(context)!.close, );