GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-27 23:09:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/no-loading-popup-on-history' into 'main'

Browse Source 
fix: Don't show loading dialog on request history

See merge request famedly/fluffychat!323
This commit is contained in:
Christian Pauly 2020-12-27 11:34:37 +00:00
commit 4a2a472d6c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/views/chat.dart
View File

@ -11,6 +11,7 @@ import 'package:fluffychat/components/avatar.dart';
import 'package:fluffychat/components/chat_settings_popup_menu.dart'; import 'package:fluffychat/components/chat_settings_popup_menu.dart';
import 'package:fluffychat/components/connection_status_header.dart'; import 'package:fluffychat/components/connection_status_header.dart';
import 'package:fluffychat/components/dialogs/recording_dialog.dart'; import 'package:fluffychat/components/dialogs/recording_dialog.dart';
import 'package:flushbar/flushbar_helper.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:fluffychat/components/encryption_button.dart'; import 'package:fluffychat/components/encryption_button.dart';
import 'package:fluffychat/components/list_items/message.dart'; import 'package:fluffychat/components/list_items/message.dart';
@ -114,10 +115,13 @@ class _ChatState extends State<_Chat> {
if (_canLoadMore) { if (_canLoadMore) {
setState(() => _loadingHistory = true); setState(() => _loadingHistory = true);
await showFutureLoadingDialog( try {
context: context, await timeline.requestHistory(historyCount: _loadHistoryCount);
future: () => timeline.requestHistory(historyCount: _loadHistoryCount), } catch (err) {
); await FlushbarHelper.createError(
message: err.toLocalizedString(context))
.show(context);
}
// we do NOT setState() here as then the event order will be wrong. // we do NOT setState() here as then the event order will be wrong.
// instead, we just set our variable to false, and rely on timeline update to set the // instead, we just set our variable to false, and rely on timeline update to set the