Merge branch 'master' into gh-actions

pull/120/head
Alya Sirko 2022-09-20 14:44:28 +03:00
commit 6b911bb8a6
2 changed files with 11 additions and 7 deletions

View File

@ -1,6 +1,6 @@
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:selfprivacy/config/get_it_config.dart'; // import 'package:selfprivacy/config/get_it_config.dart';
class SimpleBlocObserver extends BlocObserver { class SimpleBlocObserver extends BlocObserver {
SimpleBlocObserver(); SimpleBlocObserver();
@ -11,9 +11,9 @@ class SimpleBlocObserver extends BlocObserver {
final Object error, final Object error,
final StackTrace stackTrace, final StackTrace stackTrace,
) { ) {
getIt<NavigationService>().showSnackBar( // getIt<NavigationService>().showSnackBar(
'Bloc error: ${error.toString()}', // 'Bloc error: ${error.toString()}',
); // );
super.onError(bloc, error, stackTrace); super.onError(bloc, error, stackTrace);
} }
} }

View File

@ -12,9 +12,13 @@ class ServerJobsState extends ServerInstallationDependendState {
final String? migrationJobUid; final String? migrationJobUid;
List<ServerJob> get serverJobList { List<ServerJob> get serverJobList {
final List<ServerJob> list = _serverJobList; try {
list.sort((final a, final b) => b.createdAt.compareTo(a.createdAt)); final List<ServerJob> list = _serverJobList;
return list; list.sort((final a, final b) => b.createdAt.compareTo(a.createdAt));
return list;
} on UnsupportedError {
return _serverJobList;
}
} }
bool get hasRemovableJobs => serverJobList.any( bool get hasRemovableJobs => serverJobList.any(