diff --git a/README.md b/README.md index 6a915da..a83b492 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,13 @@ An (almost) fully fledged mobile paperless client.

+

+ + + +

+ ·--> Report Bug · Request Feature diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7ed9d63..0c93ae0 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,15 @@ - - + + + + + + + + + + + + + + diff --git a/lib/core/bloc/global_error_cubit.dart b/lib/core/bloc/global_error_cubit.dart deleted file mode 100644 index 878b264..0000000 --- a/lib/core/bloc/global_error_cubit.dart +++ /dev/null @@ -1,46 +0,0 @@ -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:injectable/injectable.dart'; -import 'package:paperless_mobile/core/model/error_message.dart'; - -/// -/// Class for handling generic errors which usually only require to inform the user via a Snackbar -/// or similar that an error has occurred. -/// -@singleton -class GlobalErrorCubit extends Cubit { - static const _waitBeforeNextErrorDuration = Duration(seconds: 5); - - GlobalErrorCubit() : super(GlobalErrorState.initial); - - /// - /// Adds a new error to this bloc. If the new error is equal to the current error, the new error - /// will not be published unless the previous error occured over 5 seconds ago. - /// - void add(ErrorMessage error) { - final now = DateTime.now(); - if (error != state.error || (error == state.error && _canEmitNewError())) { - emit(GlobalErrorState(error: error, errorTimestamp: now)); - } - } - - bool _canEmitNewError() { - if (state.errorTimestamp != null) { - return DateTime.now().difference(state.errorTimestamp!).inSeconds >= 5; - } - return true; - } - - void reset() { - emit(GlobalErrorState.initial); - } -} - -class GlobalErrorState { - static const GlobalErrorState initial = GlobalErrorState(); - final ErrorMessage? error; - final DateTime? errorTimestamp; - - const GlobalErrorState({this.error, this.errorTimestamp}); - - bool get hasError => error != null; -} diff --git a/lib/core/bloc/label_cubit.dart b/lib/core/bloc/label_cubit.dart index cfa1d60..07c3580 100644 --- a/lib/core/bloc/label_cubit.dart +++ b/lib/core/bloc/label_cubit.dart @@ -1,75 +1,42 @@ import 'package:flutter/foundation.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; -import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/features/labels/model/label.model.dart'; import 'package:paperless_mobile/features/labels/repository/label_repository.dart'; abstract class LabelCubit extends Cubit> { final LabelRepository labelRepository; - final GlobalErrorCubit errorCubit; - LabelCubit(this.labelRepository, this.errorCubit) : super({}); + LabelCubit(this.labelRepository) : super({}); @protected void loadFrom(Iterable items) => emit(Map.fromIterable(items, key: (e) => (e as T).id!)); - Future add( - T item, { - bool propagateEventOnError = true, - }) async { + Future add(T item) async { assert(item.id == null); - try { - final addedItem = await save(item); - final newState = {...state}; - newState.putIfAbsent(addedItem.id!, () => addedItem); - emit(newState); - return addedItem; - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - return Future.error(error); - } + final addedItem = await save(item); + final newState = {...state}; + newState.putIfAbsent(addedItem.id!, () => addedItem); + emit(newState); + return addedItem; } - Future replace( - T item, { - bool propagateEventOnError = true, - }) async { + Future replace(T item) async { assert(item.id != null); - try { - final updatedItem = await update(item); - final newState = {...state}; - newState[item.id!] = updatedItem; - emit(newState); - return updatedItem; - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - return Future.error(error); - } + final updatedItem = await update(item); + final newState = {...state}; + newState[item.id!] = updatedItem; + emit(newState); + return updatedItem; } - Future remove( - T item, { - bool propagateEventOnError = true, - }) async { + Future remove(T item) async { assert(item.id != null); if (state.containsKey(item.id)) { - try { - final deletedId = await delete(item); - final newState = {...state}; - newState.remove(deletedId); - emit(newState); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - return Future.error(error); - } + final deletedId = await delete(item); + final newState = {...state}; + newState.remove(deletedId); + emit(newState); } } diff --git a/lib/core/global/constants.dart b/lib/core/global/constants.dart new file mode 100644 index 0000000..652572f --- /dev/null +++ b/lib/core/global/constants.dart @@ -0,0 +1 @@ +const supportedFileExtensions = ['pdf', 'png', 'tiff', 'gif', 'jpg', 'jpeg']; diff --git a/lib/core/logic/error_code_localization_mapper.dart b/lib/core/logic/error_code_localization_mapper.dart index aadc175..9ad6c99 100644 --- a/lib/core/logic/error_code_localization_mapper.dart +++ b/lib/core/logic/error_code_localization_mapper.dart @@ -66,5 +66,7 @@ String translateError(BuildContext context, ErrorCode code) { return S.of(context).errorMessageRequestTimedOut; case ErrorCode.unsupportedFileFormat: return S.of(context).errorMessageUnsupportedFileFormat; + case ErrorCode.missingClientCertificate: + return S.of(context).errorMessageMissingClientCertificate; } } diff --git a/lib/core/logic/timeout_client.dart b/lib/core/logic/timeout_client.dart index 496f67e..f0fe55d 100644 --- a/lib/core/logic/timeout_client.dart +++ b/lib/core/logic/timeout_client.dart @@ -35,8 +35,12 @@ class TimeoutClient implements BaseClient { } @override - Future delete(Uri url, - {Map? headers, Object? body, Encoding? encoding}) async { + Future delete( + Uri url, { + Map? headers, + Object? body, + Encoding? encoding, + }) async { await _handleOfflineState(); return _handle400Error( await getIt() @@ -50,7 +54,10 @@ class TimeoutClient implements BaseClient { } @override - Future get(Uri url, {Map? headers}) async { + Future get( + Uri url, { + Map? headers, + }) async { await _handleOfflineState(); return _handle400Error( await getIt().get(url, headers: headers).timeout( @@ -62,7 +69,10 @@ class TimeoutClient implements BaseClient { } @override - Future head(Uri url, {Map? headers}) async { + Future head( + Uri url, { + Map? headers, + }) async { await _handleOfflineState(); return _handle400Error( await getIt().head(url, headers: headers).timeout( @@ -74,8 +84,12 @@ class TimeoutClient implements BaseClient { } @override - Future patch(Uri url, - {Map? headers, Object? body, Encoding? encoding}) async { + Future patch( + Uri url, { + Map? headers, + Object? body, + Encoding? encoding, + }) async { await _handleOfflineState(); return _handle400Error( await getIt() @@ -89,8 +103,12 @@ class TimeoutClient implements BaseClient { } @override - Future post(Uri url, - {Map? headers, Object? body, Encoding? encoding}) async { + Future post( + Uri url, { + Map? headers, + Object? body, + Encoding? encoding, + }) async { await _handleOfflineState(); return _handle400Error( await getIt() @@ -104,8 +122,12 @@ class TimeoutClient implements BaseClient { } @override - Future put(Uri url, - {Map? headers, Object? body, Encoding? encoding}) async { + Future put( + Uri url, { + Map? headers, + Object? body, + Encoding? encoding, + }) async { await _handleOfflineState(); return _handle400Error( await getIt() @@ -119,7 +141,10 @@ class TimeoutClient implements BaseClient { } @override - Future read(Uri url, {Map? headers}) async { + Future read( + Uri url, { + Map? headers, + }) async { await _handleOfflineState(); return getIt().read(url, headers: headers).timeout( requestTimeout, @@ -129,7 +154,10 @@ class TimeoutClient implements BaseClient { } @override - Future readBytes(Uri url, {Map? headers}) async { + Future readBytes( + Uri url, { + Map? headers, + }) async { await _handleOfflineState(); return getIt().readBytes(url, headers: headers).timeout( requestTimeout, diff --git a/lib/core/model/error_message.dart b/lib/core/model/error_message.dart index 1041af5..e49ac4d 100644 --- a/lib/core/model/error_message.dart +++ b/lib/core/model/error_message.dart @@ -1,9 +1,11 @@ class ErrorMessage implements Exception { final ErrorCode code; + final String? details; final StackTrace? stackTrace; final int? httpStatusCode; - const ErrorMessage(this.code, {this.stackTrace, this.httpStatusCode}); + const ErrorMessage(this.code, + {this.details, this.stackTrace, this.httpStatusCode}); factory ErrorMessage.unknown() { return const ErrorMessage(ErrorCode.unknown); @@ -46,5 +48,6 @@ enum ErrorCode { createSavedViewError, deleteSavedViewError, requestTimedOut, - unsupportedFileFormat; + unsupportedFileFormat, + missingClientCertificate; } diff --git a/lib/core/service/file_service.dart b/lib/core/service/file_service.dart new file mode 100644 index 0000000..b13151c --- /dev/null +++ b/lib/core/service/file_service.dart @@ -0,0 +1,95 @@ +import 'dart:io'; + +import 'package:flutter/foundation.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:uuid/uuid.dart'; + +class FileService { + static Future saveToFile( + Uint8List bytes, + String filename, + ) async { + final dir = await documentsDirectory; + if (dir == null) { + throw ErrorMessage.unknown(); //TODO: better handling + } + File file = File("${dir.path}/$filename"); + return file..writeAsBytes(bytes); + } + + static Future getDirectory(PaperlessDirectoryType type) { + switch (type) { + case PaperlessDirectoryType.documents: + return documentsDirectory; + case PaperlessDirectoryType.temporary: + return temporaryDirectory; + case PaperlessDirectoryType.scans: + return scanDirectory; + case PaperlessDirectoryType.download: + return downloadsDirectory; + } + } + + static Future allocateTemporaryFile( + PaperlessDirectoryType type, { + required String extension, + String? fileName, + }) async { + final dir = await getDirectory(type); + final _fileName = (fileName ?? const Uuid().v1()) + '.$extension'; + return File('${dir?.path}/$_fileName'); + } + + static Future get temporaryDirectory => getTemporaryDirectory(); + + static Future get documentsDirectory async { + if (Platform.isAndroid) { + return (await getExternalStorageDirectories( + type: StorageDirectory.documents, + ))! + .first; + } else if (Platform.isIOS) { + return getApplicationDocumentsDirectory(); + } else { + throw UnsupportedError("Platform not supported."); + } + } + + static Future get downloadsDirectory async { + if (Platform.isAndroid) { + return (await getExternalStorageDirectories( + type: StorageDirectory.downloads))! + .first; + } else if (Platform.isIOS) { + return getApplicationDocumentsDirectory(); + } else { + throw UnsupportedError("Platform not supported."); + } + } + + static Future get scanDirectory async { + if (Platform.isAndroid) { + return (await getExternalStorageDirectories(type: StorageDirectory.dcim))! + .first; + } else if (Platform.isIOS) { + return getApplicationDocumentsDirectory(); + } else { + throw UnsupportedError("Platform not supported."); + } + } + + static Future clearUserData() async { + final scanDir = await scanDirectory; + final tempDir = await temporaryDirectory; + scanDir?.delete(recursive: true); + tempDir.delete(recursive: true); + } +} + +enum PaperlessDirectoryType { + documents, + temporary, + scans, + download; +} diff --git a/lib/core/service/status.service.dart b/lib/core/service/status.service.dart index 0cc3f1b..d96274c 100644 --- a/lib/core/service/status.service.dart +++ b/lib/core/service/status.service.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; +import 'package:flutter/foundation.dart'; import 'package:paperless_mobile/core/bloc/document_status_cubit.dart'; import 'package:paperless_mobile/core/model/document_processing_status.dart'; import 'package:paperless_mobile/di_initializer.dart'; @@ -89,8 +90,11 @@ class LongPollingStatusService implements StatusService { Uri.parse( '$httpUrl/api/documents/?query=$documentFileName added:${formatDate(today)}'), ); - final data = PagedSearchResult.fromJson( - jsonDecode(response.body), DocumentModel.fromJson); + final data = await compute( + PagedSearchResult.fromJson, + PagedSearchResultJsonSerializer( + jsonDecode(response.body), DocumentModel.fromJson), + ); if (data.count > 0) { consumptionFinished = true; final docId = data.results[0].id; diff --git a/lib/core/util.dart b/lib/core/util.dart index db3ef7c..9e26b0b 100644 --- a/lib/core/util.dart +++ b/lib/core/util.dart @@ -1,13 +1,9 @@ import 'dart:convert'; -import 'dart:io'; -import 'dart:typed_data'; - -import 'package:paperless_mobile/core/logic/timeout_client.dart'; +import 'package:flutter/foundation.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/core/type/types.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:http/http.dart'; -import 'package:path_provider/path_provider.dart'; const requestTimeout = Duration(seconds: 5); @@ -23,7 +19,10 @@ Future getSingleResult( headers: {'accept': 'application/json; version=$minRequiredApiVersion'}, ); if (response.statusCode == 200) { - return fromJson(jsonDecode(utf8.decode(response.bodyBytes)) as JSON); + return compute( + fromJson, + jsonDecode(utf8.decode(response.bodyBytes)) as JSON, + ); } return Future.error(errorCode); } @@ -45,25 +44,25 @@ Future> getCollection( if (body['count'] == 0) { return []; } else { - return body['results'] - .cast() - .map((result) => fromJson(result)) - .toList(); + return compute( + _collectionFromJson, + _CollectionFromJsonSerializationParams( + fromJson, (body['results'] as List).cast()), + ); } } } return Future.error(errorCode); } -class FileUtils { - static Future saveToFile( - Uint8List bytes, - String filename, { - StorageDirectory directoryType = StorageDirectory.documents, - }) async { - final dir = (await getExternalStorageDirectories(type: directoryType)); - File file = File("$dir/$filename"); - file.writeAsBytesSync(bytes); - return file; - } +List _collectionFromJson( + _CollectionFromJsonSerializationParams params) { + return params.list.map((result) => params.fromJson(result)).toList(); +} + +class _CollectionFromJsonSerializationParams { + final T Function(JSON) fromJson; + final List list; + + _CollectionFromJsonSerializationParams(this.fromJson, this.list); } diff --git a/lib/features/documents/bloc/documents_cubit.dart b/lib/features/documents/bloc/documents_cubit.dart index 4697984..016c5bc 100644 --- a/lib/features/documents/bloc/documents_cubit.dart +++ b/lib/features/documents/bloc/documents_cubit.dart @@ -1,7 +1,6 @@ import 'dart:typed_data'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_state.dart'; import 'package:paperless_mobile/features/documents/model/document.model.dart'; @@ -13,10 +12,8 @@ import 'package:injectable/injectable.dart'; @singleton class DocumentsCubit extends Cubit { final DocumentRepository documentRepository; - final GlobalErrorCubit errorCubit; - DocumentsCubit(this.documentRepository, this.errorCubit) - : super(DocumentsState.initial); + DocumentsCubit(this.documentRepository) : super(DocumentsState.initial); Future addDocument( Uint8List bytes, @@ -27,209 +24,99 @@ class DocumentsCubit extends Cubit { int? correspondent, List? tags, DateTime? createdAt, - bool propagateEventOnError = true, }) async { - try { - await documentRepository.create( - bytes, - fileName, - title: title, - documentType: documentType, - correspondent: correspondent, - tags: tags, - createdAt: createdAt, - ); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + await documentRepository.create( + bytes, + fileName, + title: title, + documentType: documentType, + correspondent: correspondent, + tags: tags, + createdAt: createdAt, + ); + // documentRepository // .waitForConsumptionFinished(fileName, title) // .then((value) => onConsumptionFinished(value)); } - Future removeDocument( - DocumentModel document, { - bool propagateEventOnError = true, - }) async { - try { - await documentRepository.delete(document); - return await reloadDocuments(); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + Future removeDocument(DocumentModel document) async { + await documentRepository.delete(document); + return await reloadDocuments(); } - Future bulkRemoveDocuments(List documents, - {bool propagateEventOnError = true}) async { - try { - await documentRepository.bulkDelete(documents); - return await reloadDocuments(); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + Future bulkRemoveDocuments(List documents) async { + await documentRepository.bulkDelete(documents); + return await reloadDocuments(); } - Future updateDocument( - DocumentModel document, { - bool propagateEventOnError = true, - }) async { - try { - await documentRepository.update(document); - await reloadDocuments(); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + Future updateDocument(DocumentModel document) async { + await documentRepository.update(document); + await reloadDocuments(); } - Future loadDocuments({ - bool propagateEventOnError = true, - }) async { - try { - final result = await documentRepository.find(state.filter); - emit(DocumentsState( - isLoaded: true, - value: [...state.value, result], - filter: state.filter, - )); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + Future loadDocuments() async { + final result = await documentRepository.find(state.filter); + emit(DocumentsState( + isLoaded: true, + value: [...state.value, result], + filter: state.filter, + )); } - Future reloadDocuments({ - bool propagateEventOnError = true, - }) async { + Future reloadDocuments() async { if (state.currentPageNumber >= 5) { return _bulkReloadDocuments(); } var newPages = []; - try { - for (final page in state.value) { - final result = await documentRepository - .find(state.filter.copyWith(page: page.pageKey)); - newPages.add(result); - } - emit(DocumentsState( - isLoaded: true, value: newPages, filter: state.filter)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } + for (final page in state.value) { + final result = await documentRepository + .find(state.filter.copyWith(page: page.pageKey)); + newPages.add(result); } + emit(DocumentsState(isLoaded: true, value: newPages, filter: state.filter)); } - Future _bulkReloadDocuments({ - bool propagateEventOnError = true, - }) async { - try { - final result = await documentRepository.find( - state.filter.copyWith(page: 1, pageSize: state.documents.length)); - emit(DocumentsState( - isLoaded: true, value: [result], filter: state.filter)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + Future _bulkReloadDocuments() async { + final result = await documentRepository + .find(state.filter.copyWith(page: 1, pageSize: state.documents.length)); + emit(DocumentsState(isLoaded: true, value: [result], filter: state.filter)); } - Future loadMore({ - bool propagateEventOnError = true, - }) async { + Future loadMore() async { if (state.isLastPageLoaded) { return; } final newFilter = state.filter.copyWith(page: state.filter.page + 1); - try { - final result = await documentRepository.find(newFilter); - emit(DocumentsState( - isLoaded: true, value: [...state.value, result], filter: newFilter)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + final result = await documentRepository.find(newFilter); + emit(DocumentsState( + isLoaded: true, value: [...state.value, result], filter: newFilter)); } - Future assignAsn( - DocumentModel document, { - bool propagateEventOnError = true, - }) async { - try { - if (document.archiveSerialNumber == null) { - final int asn = await documentRepository.findNextAsn(); - updateDocument(document.copyWith(archiveSerialNumber: asn)); - } - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } + Future assignAsn(DocumentModel document) async { + if (document.archiveSerialNumber == null) { + final int asn = await documentRepository.findNextAsn(); + updateDocument(document.copyWith(archiveSerialNumber: asn)); } } /// /// Update filter state and automatically reload documents. Always resets page to 1. /// Use [DocumentsCubit.loadMore] to load more data. - Future updateFilter( - {final DocumentFilter filter = DocumentFilter.initial, - bool propagateEventOnError = true}) async { - try { - final result = await documentRepository.find(filter.copyWith(page: 1)); - emit(DocumentsState(filter: filter, value: [result], isLoaded: true)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } else { - rethrow; - } - } + Future updateFilter({ + final DocumentFilter filter = DocumentFilter.initial, + }) async { + final result = await documentRepository.find(filter.copyWith(page: 1)); + emit(DocumentsState(filter: filter, value: [result], isLoaded: true)); } /// /// Convenience method which allows to directly use [DocumentFilter.copyWith] on the current filter. /// Future updateCurrentFilter( - final DocumentFilter Function(DocumentFilter) transformFn, { - bool propagateEventOnError = true, - }) async { - try { - return updateFilter(filter: transformFn(state.filter)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - return errorCubit.add(error); - } else { - rethrow; - } - } - } + final DocumentFilter Function(DocumentFilter) transformFn, + ) async => + updateFilter(filter: transformFn(state.filter)); void toggleDocumentSelection(DocumentModel model) { if (state.selection.contains(model)) { diff --git a/lib/features/documents/bloc/saved_view_cubit.dart b/lib/features/documents/bloc/saved_view_cubit.dart index e9c234c..9237be0 100644 --- a/lib/features/documents/bloc/saved_view_cubit.dart +++ b/lib/features/documents/bloc/saved_view_cubit.dart @@ -1,5 +1,4 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/features/documents/bloc/saved_view_state.dart'; @@ -9,79 +8,42 @@ import 'package:injectable/injectable.dart'; @singleton class SavedViewCubit extends Cubit { - final GlobalErrorCubit errorCubit; - SavedViewCubit(this.errorCubit) : super(SavedViewState(value: {})); + SavedViewCubit() : super(SavedViewState(value: {})); - void selectView(SavedView? view, {bool propagateEventOnError = true}) { - try { - emit(SavedViewState(value: state.value, selectedSavedViewId: view?.id)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - rethrow; - } + void selectView(SavedView? view) { + emit(SavedViewState(value: state.value, selectedSavedViewId: view?.id)); } - Future add( - SavedView view, { - bool propagateEventOnError = true, - }) async { - try { - final savedView = await getIt().save(view); - emit( - SavedViewState( - value: {...state.value, savedView.id!: savedView}, - selectedSavedViewId: state.selectedSavedViewId, - ), - ); - return savedView; - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - rethrow; - } + Future add(SavedView view) async { + final savedView = await getIt().save(view); + emit( + SavedViewState( + value: {...state.value, savedView.id!: savedView}, + selectedSavedViewId: state.selectedSavedViewId, + ), + ); + return savedView; } - Future remove( - SavedView view, { - bool propagateEventOnError = true, - }) async { - try { - final id = await getIt().delete(view); - final newValue = {...state.value}; - newValue.removeWhere((key, value) => key == id); - emit( - SavedViewState( - value: newValue, - selectedSavedViewId: view.id == state.selectedSavedViewId - ? null - : state.selectedSavedViewId, - ), - ); - return id; - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - rethrow; - } + Future remove(SavedView view) async { + final id = await getIt().delete(view); + final newValue = {...state.value}; + newValue.removeWhere((key, value) => key == id); + emit( + SavedViewState( + value: newValue, + selectedSavedViewId: view.id == state.selectedSavedViewId + ? null + : state.selectedSavedViewId, + ), + ); + return id; } - Future initialize({ - bool propagateEventOnError = true, - }) async { - try { - final views = await getIt().getAll(); - final values = {for (var element in views) element.id!: element}; - emit(SavedViewState(value: values)); - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); - } - rethrow; - } + Future initialize() async { + final views = await getIt().getAll(); + final values = {for (var element in views) element.id!: element}; + emit(SavedViewState(value: values)); } void resetSelection() { diff --git a/lib/features/documents/model/paged_search_result.dart b/lib/features/documents/model/paged_search_result.dart index a80a56f..c95878a 100644 --- a/lib/features/documents/model/paged_search_result.dart +++ b/lib/features/documents/model/paged_search_result.dart @@ -4,6 +4,13 @@ import 'package:paperless_mobile/features/documents/model/document.model.dart'; const pageRegex = r".*page=(\d+).*"; +class PagedSearchResultJsonSerializer { + final JSON json; + final T Function(JSON) fromJson; + + PagedSearchResultJsonSerializer(this.json, this.fromJson); +} + class PagedSearchResult extends Equatable { /// Total number of available items final int count; @@ -46,12 +53,14 @@ class PagedSearchResult extends Equatable { }); factory PagedSearchResult.fromJson( - Map json, T Function(JSON) fromJson) { + PagedSearchResultJsonSerializer serializer) { return PagedSearchResult( - count: json['count'], - next: json['next'], - previous: json['previous'], - results: List.from(json['results']).map(fromJson).toList(), + count: serializer.json['count'], + next: serializer.json['next'], + previous: serializer.json['previous'], + results: List.from(serializer.json['results']) + .map(serializer.fromJson) + .toList(), ); } diff --git a/lib/features/documents/repository/document_repository_impl.dart b/lib/features/documents/repository/document_repository_impl.dart index cb7e6b9..06a2f32 100644 --- a/lib/features/documents/repository/document_repository_impl.dart +++ b/lib/features/documents/repository/document_repository_impl.dart @@ -138,8 +138,10 @@ class DocumentRepositoryImpl implements DocumentRepository { body: json.encode(doc.toJson()), headers: {"Content-Type": "application/json"}).timeout(requestTimeout); if (response.statusCode == 200) { - return DocumentModel.fromJson( - jsonDecode(utf8.decode(response.bodyBytes))); + return compute( + DocumentModel.fromJson, + jsonDecode(utf8.decode(response.bodyBytes)) as JSON, + ); } else { throw const ErrorMessage(ErrorCode.documentUpdateFailed); } @@ -152,11 +154,13 @@ class DocumentRepositoryImpl implements DocumentRepository { Uri.parse("/api/documents/?$filterParams"), ); if (response.statusCode == 200) { - final searchResult = PagedSearchResult.fromJson( - jsonDecode(utf8.decode(response.bodyBytes)), - DocumentModel.fromJson, + return compute( + PagedSearchResult.fromJson, + PagedSearchResultJsonSerializer( + jsonDecode(utf8.decode(response.bodyBytes)), + DocumentModel.fromJson, + ), ); - return searchResult; } else { throw const ErrorMessage(ErrorCode.documentLoadFailed); } @@ -261,8 +265,10 @@ class DocumentRepositoryImpl implements DocumentRepository { Future getMetaData(DocumentModel document) async { final response = await httpClient .get(Uri.parse("/api/documents/${document.id}/metadata/")); - return DocumentMetaData.fromJson( - jsonDecode(utf8.decode(response.bodyBytes))); + return compute( + DocumentMetaData.fromJson, + jsonDecode(utf8.decode(response.bodyBytes)) as JSON, + ); } @override @@ -280,10 +286,14 @@ class DocumentRepositoryImpl implements DocumentRepository { final response = await httpClient .get(Uri.parse("/api/documents/?more_like=$docId&pageSize=10")); if (response.statusCode == 200) { - return PagedSearchResult.fromJson( - jsonDecode(utf8.decode(response.bodyBytes)), - SimilarDocumentModel.fromJson, - ).results; + return (await compute( + PagedSearchResult.fromJson, + PagedSearchResultJsonSerializer( + jsonDecode(utf8.decode(response.bodyBytes)), + SimilarDocumentModel.fromJson, + ), + )) + .results; } throw const ErrorMessage(ErrorCode.similarQueryError); } diff --git a/lib/features/documents/view/pages/document_details_page.dart b/lib/features/documents/view/pages/document_details_page.dart index 085256a..9fa0370 100644 --- a/lib/features/documents/view/pages/document_details_page.dart +++ b/lib/features/documents/view/pages/document_details_page.dart @@ -198,10 +198,8 @@ class _DocumentDetailsPageState extends State { child: Text(S .of(context) .documentDetailsPageAssignAsnButtonLabel), - onPressed: widget.allowEdit - ? () => BlocProvider.of(context) - .assignAsn(document) - : null, + onPressed: + widget.allowEdit ? () => _assignAsn(document) : null, ), ), _separator(), @@ -233,6 +231,14 @@ class _DocumentDetailsPageState extends State { ); } + Future _assignAsn(DocumentModel document) async { + try { + await BlocProvider.of(context).assignAsn(document); + } on ErrorMessage catch (error) { + showError(context, error); + } + } + Widget _buildDocumentContentView(DocumentModel document, String? match) { return SingleChildScrollView( child: _DetailsItem( @@ -392,21 +398,23 @@ class _DocumentDetailsPageState extends State { ); } - Future _onDelete(DocumentModel document) async { - showDialog( - context: context, - builder: (context) => - DeleteDocumentConfirmationDialog(document: document)) - .then((delete) { - if (delete ?? false) { - BlocProvider.of(context) - .removeDocument(document) - .then((value) { - Navigator.pop(context); - showSnackBar(context, S.of(context).documentDeleteSuccessMessage); - }); + void _onDelete(DocumentModel document) async { + final delete = await showDialog( + context: context, + builder: (context) => + DeleteDocumentConfirmationDialog(document: document), + ) ?? + false; + if (delete) { + try { + await BlocProvider.of(context).removeDocument(document); + showSnackBar(context, S.of(context).documentDeleteSuccessMessage); + } on ErrorMessage catch (error) { + showError(context, error); + } finally { + Navigator.pop(context); } - }); + } } Future _onOpen(DocumentModel document) async { diff --git a/lib/features/documents/view/pages/document_edit_page.dart b/lib/features/documents/view/pages/document_edit_page.dart index 36d7b61..5ad6cc6 100644 --- a/lib/features/documents/view/pages/document_edit_page.dart +++ b/lib/features/documents/view/pages/document_edit_page.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; @@ -76,10 +77,14 @@ class _DocumentEditPageState extends State { setState(() { _isSubmitLoading = true; }); - await getIt().updateDocument(updatedDocument); - Navigator.pop(context); - showSnackBar( - context, "Document successfully updated."); //TODO: INTL + try { + await getIt().updateDocument(updatedDocument); + showSnackBar(context, S.of(context).documentUpdateErrorMessage); + } on ErrorMessage catch (error) { + showError(context, error); + } finally { + Navigator.pop(context); + } } }, icon: const Icon(Icons.save), diff --git a/lib/features/documents/view/pages/documents_page.dart b/lib/features/documents/view/pages/documents_page.dart index fb4f8f0..426a3af 100644 --- a/lib/features/documents/view/pages/documents_page.dart +++ b/lib/features/documents/view/pages/documents_page.dart @@ -44,13 +44,20 @@ class _DocumentsPageState extends State { @override void initState() { super.initState(); - final documentsCubit = BlocProvider.of(context); - if (!documentsCubit.state.isLoaded) { - documentsCubit.loadDocuments(); + if (!BlocProvider.of(context).state.isLoaded) { + _initDocuments(); } _pagingController.addPageRequestListener(_loadNewPage); } + Future _initDocuments() async { + try { + BlocProvider.of(context).loadDocuments(); + } on ErrorMessage catch (error) { + showError(context, error); + } + } + @override void dispose() { _pagingController.dispose(); @@ -64,17 +71,25 @@ class _DocumentsPageState extends State { if (pageCount <= pageKey + 1) { _pagingController.nextPageKey = null; } - documentsCubit.loadMore(); + try { + await documentsCubit.loadMore(); + } on ErrorMessage catch (error) { + showError(context, error); + } } void _onSelected(DocumentModel model) { BlocProvider.of(context).toggleDocumentSelection(model); } - Future _onRefresh() { - final documentsCubit = BlocProvider.of(context); - return documentsCubit.updateFilter( - filter: documentsCubit.state.filter.copyWith(page: 1)); + Future _onRefresh() async { + try { + await BlocProvider.of(context).updateCurrentFilter( + (filter) => filter.copyWith(page: 1), + ); + } on ErrorMessage catch (error) { + showError(context, error); + } } @override @@ -86,9 +101,9 @@ class _DocumentsPageState extends State { _panelController.close(); return false; } - final docBloc = BlocProvider.of(context); - if (docBloc.state.selection.isNotEmpty) { - docBloc.resetSelection(); + final documentsCubit = BlocProvider.of(context); + if (documentsCubit.state.selection.isNotEmpty) { + documentsCubit.resetSelection(); return false; } return true; diff --git a/lib/features/documents/view/widgets/documents_empty_state.dart b/lib/features/documents/view/widgets/documents_empty_state.dart index f5c0026..e2d15bb 100644 --- a/lib/features/documents/view/widgets/documents_empty_state.dart +++ b/lib/features/documents/view/widgets/documents_empty_state.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart'; -import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/core/widgets/empty_state.dart'; import 'package:paperless_mobile/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; diff --git a/lib/features/documents/view/widgets/search/document_filter_panel.dart b/lib/features/documents/view/widgets/search/document_filter_panel.dart index 603b4b6..31e8ad8 100644 --- a/lib/features/documents/view/widgets/search/document_filter_panel.dart +++ b/lib/features/documents/view/widgets/search/document_filter_panel.dart @@ -513,7 +513,7 @@ class _DocumentFilterPanelState extends State { ); } - void _onApplyFilter() { + void _onApplyFilter() async { if (_formKey.currentState?.saveAndValidate() ?? false) { final v = _formKey.currentState!.value; final docCubit = BlocProvider.of(context); @@ -530,13 +530,15 @@ class _DocumentFilterPanelState extends State { addedDateAfter: (v[fkAddedAt] as DateTimeRange?)?.start, queryType: v[QueryTypeFormField.fkQueryType] as QueryType, ); - BlocProvider.of(context) - .updateFilter(filter: newFilter) - .then((value) { + try { + await BlocProvider.of(context) + .updateFilter(filter: newFilter); BlocProvider.of(context).resetSelection(); FocusScope.of(context).unfocus(); widget.panelController.close(); - }); + } on ErrorMessage catch (error) { + showError(context, error); + } } } diff --git a/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart b/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart index 8926012..f38dfd8 100644 --- a/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart +++ b/lib/features/documents/view/widgets/selection/documents_page_app_bar.dart @@ -74,14 +74,22 @@ class _DocumentsPageAppBarState extends State { void _onDelete(BuildContext context, DocumentsState documentsState) async { final shouldDelete = await showDialog( - context: context, - builder: (context) => BulkDeleteConfirmationDialog(state: documentsState), - ); - if (shouldDelete ?? false) { - BlocProvider.of(context) - .bulkRemoveDocuments(documentsState.selection) - .then((_) => showSnackBar( - context, S.of(context).documentsPageBulkDeleteSuccessfulText)); + context: context, + builder: (context) => + BulkDeleteConfirmationDialog(state: documentsState), + ) ?? + false; + if (shouldDelete) { + try { + await BlocProvider.of(context) + .bulkRemoveDocuments(documentsState.selection); + showSnackBar( + context, + S.of(context).documentsPageBulkDeleteSuccessfulText, + ); + } on ErrorMessage catch (error) { + showError(context, error); + } } } diff --git a/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart b/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart index 7ee8441..d31f8cc 100644 --- a/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart +++ b/lib/features/documents/view/widgets/selection/saved_view_selection_widget.dart @@ -78,22 +78,32 @@ class SavedViewSelectionWidget extends StatelessWidget { final newView = await Navigator.of(context).push( MaterialPageRoute( builder: (context) => AddSavedViewPage( - currentFilter: getIt().state.filter), + currentFilter: getIt().state.filter, + ), ), ); if (newView != null) { - BlocProvider.of(context).add(newView); + try { + await BlocProvider.of(context).add(newView); + } on ErrorMessage catch (error) { + showError(context, error); + } } } - void _onSelected(bool isSelected, BuildContext context, SavedView view) { - if (isSelected) { - BlocProvider.of(context) - .updateFilter(filter: view.toDocumentFilter()); - BlocProvider.of(context).selectView(view); - } else { - BlocProvider.of(context).updateFilter(); - BlocProvider.of(context).selectView(null); + void _onSelected( + bool isSelected, BuildContext context, SavedView view) async { + try { + if (isSelected) { + BlocProvider.of(context) + .updateFilter(filter: view.toDocumentFilter()); + BlocProvider.of(context).selectView(view); + } else { + BlocProvider.of(context).updateFilter(); + BlocProvider.of(context).selectView(null); + } + } on ErrorMessage catch (error) { + showError(context, error); } } @@ -105,7 +115,11 @@ class SavedViewSelectionWidget extends StatelessWidget { ) ?? false; if (delete) { - BlocProvider.of(context).remove(view); + try { + BlocProvider.of(context).remove(view); + } on ErrorMessage catch (error) { + showError(context, error); + } } } } diff --git a/lib/features/documents/view/widgets/sort_documents_button.dart b/lib/features/documents/view/widgets/sort_documents_button.dart index cf3b66c..2c40e90 100644 --- a/lib/features/documents/view/widgets/sort_documents_button.dart +++ b/lib/features/documents/view/widgets/sort_documents_button.dart @@ -43,11 +43,18 @@ class _SortDocumentsButtonState extends State { ), onPressed: () async { setState(() => _isLoading = true); - BlocProvider.of(context) - .updateFilter( - filter: state.filter - .copyWith(sortOrder: state.filter.sortOrder.toggle())) - .whenComplete(() => setState(() => _isLoading = false)); + try { + await BlocProvider.of(context) + .updateCurrentFilter( + (filter) => filter.copyWith( + sortOrder: state.filter.sortOrder.toggle(), + ), + ); + } on ErrorMessage catch (error) { + showError(context, error); + } finally { + setState(() => _isLoading = false); + } }, ); } diff --git a/lib/features/home/view/home_page.dart b/lib/features/home/view/home_page.dart index 05b8b03..495e5f5 100644 --- a/lib/features/home/view/home_page.dart +++ b/lib/features/home/view/home_page.dart @@ -1,13 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/core/widgets/offline_banner.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/documents/bloc/saved_view_cubit.dart'; -import 'package:paperless_mobile/features/documents/model/saved_view.model.dart'; import 'package:paperless_mobile/features/documents/view/pages/documents_page.dart'; import 'package:paperless_mobile/features/home/view/widget/bottom_navigation_bar.dart'; import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart'; @@ -38,55 +37,51 @@ class _HomePageState extends State { @override Widget build(BuildContext context) { - return BlocListener( + return BlocConsumer( + //Only re-initialize data if the connectivity changed from not connected to connected + listenWhen: (previous, current) => current == ConnectivityState.connected, listener: (context, state) { - if (state.hasError) { - showSnackBar(context, translateError(context, state.error!.code)); - } + initializeLabelData(context); }, - child: BlocConsumer( - //Only re-initialize data if the connectivity changed from not connected to connected - listenWhen: (previous, current) => - current == ConnectivityState.connected, - listener: (context, state) { - initializeLabelData(context); - }, - builder: (context, connectivityState) { - return Scaffold( - appBar: connectivityState == ConnectivityState.connected - ? null - : const OfflineBanner(), - key: rootScaffoldKey, - bottomNavigationBar: BottomNavBar( - selectedIndex: _currentIndex, - onNavigationChanged: (index) => - setState(() => _currentIndex = index), + builder: (context, connectivityState) { + return Scaffold( + appBar: connectivityState == ConnectivityState.connected + ? null + : const OfflineBanner(), + key: rootScaffoldKey, + bottomNavigationBar: BottomNavBar( + selectedIndex: _currentIndex, + onNavigationChanged: (index) => + setState(() => _currentIndex = index), + ), + drawer: const InfoDrawer(), + body: [ + MultiBlocProvider( + providers: [ + BlocProvider.value(value: getIt()), + ], + child: const DocumentsPage(), ), - drawer: const InfoDrawer(), - body: [ - MultiBlocProvider( - providers: [ - BlocProvider.value(value: getIt()), - ], - child: const DocumentsPage(), - ), - BlocProvider.value( - value: getIt(), - child: const ScannerPage(), - ), - const LabelsPage(), - ][_currentIndex], - ); - }, - ), + BlocProvider.value( + value: getIt(), + child: const ScannerPage(), + ), + const LabelsPage(), + ][_currentIndex], + ); + }, ); } initializeLabelData(BuildContext context) { - BlocProvider.of(context).initialize(); - BlocProvider.of(context).initialize(); - BlocProvider.of(context).initialize(); - BlocProvider.of(context).initialize(); - BlocProvider.of(context).initialize(); + try { + BlocProvider.of(context).initialize(); + BlocProvider.of(context).initialize(); + BlocProvider.of(context).initialize(); + BlocProvider.of(context).initialize(); + BlocProvider.of(context).initialize(); + } on ErrorMessage catch (error) { + showError(context, error); + } } } diff --git a/lib/features/home/view/widget/info_drawer.dart b/lib/features/home/view/widget/info_drawer.dart index 91fd37e..d106cdd 100644 --- a/lib/features/home/view/widget/info_drawer.dart +++ b/lib/features/home/view/widget/info_drawer.dart @@ -1,8 +1,6 @@ -import 'dart:ui'; - import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart'; @@ -129,14 +127,16 @@ class InfoDrawer extends StatelessWidget { leading: const Icon(Icons.logout), title: Text(S.of(context).appDrawerLogoutLabel), onTap: () { - // Clear all bloc data - BlocProvider.of(context).logout(); - getIt().reset(); - getIt().reset(); - getIt().reset(); - getIt().reset(); - getIt().reset(); - getIt().reset(); + try { + BlocProvider.of(context).logout(); + getIt().reset(); + getIt().reset(); + getIt().reset(); + getIt().reset(); + getIt().reset(); + } on ErrorMessage catch (error) { + showError(context, error); + } }, ), const Divider(), diff --git a/lib/features/labels/correspondent/bloc/correspondents_cubit.dart b/lib/features/labels/correspondent/bloc/correspondents_cubit.dart index 72d21f4..03c62a2 100644 --- a/lib/features/labels/correspondent/bloc/correspondents_cubit.dart +++ b/lib/features/labels/correspondent/bloc/correspondents_cubit.dart @@ -4,7 +4,7 @@ import 'package:injectable/injectable.dart'; @singleton class CorrespondentCubit extends LabelCubit { - CorrespondentCubit(super.metaDataService, super.errorCubit); + CorrespondentCubit(super.metaDataService); @override Future initialize() async { diff --git a/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart b/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart index b279783..cebf612 100644 --- a/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart +++ b/lib/features/labels/correspondent/view/pages/edit_correspondent_page.dart @@ -18,21 +18,28 @@ class EditCorrespondentPage extends StatelessWidget { return EditLabelPage( label: correspondent, onSubmit: BlocProvider.of(context).replace, - onDelete: (correspondent) => _onDelete(correspondent, context), + onDelete: (correspondent) => _onDelete(context, correspondent), fromJson: Correspondent.fromJson, ); } Future _onDelete( - Correspondent correspondent, BuildContext context) async { - await BlocProvider.of(context).remove(correspondent); - final cubit = BlocProvider.of(context); - if (cubit.state.filter.correspondent.id == correspondent.id) { - cubit.updateFilter( - filter: cubit.state.filter - .copyWith(correspondent: const CorrespondentQuery.unset()), - ); + BuildContext context, + Correspondent correspondent, + ) async { + try { + await BlocProvider.of(context).remove(correspondent); + final cubit = BlocProvider.of(context); + if (cubit.state.filter.correspondent.id == correspondent.id) { + await cubit.updateCurrentFilter( + (filter) => filter.copyWith( + correspondent: const CorrespondentQuery.unset(), + ), + ); + } + Navigator.pop(context); + } on ErrorMessage catch (error) { + showError(context, error); } - Navigator.pop(context); } } diff --git a/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart b/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart index c25ead9..395d780 100644 --- a/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart +++ b/lib/features/labels/correspondent/view/widgets/correspondent_widget.dart @@ -1,10 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/documents/model/query_parameters/correspondent_query.dart'; import 'package:paperless_mobile/features/labels/correspondent/bloc/correspondents_cubit.dart'; import 'package:paperless_mobile/features/labels/correspondent/model/correspondent.model.dart'; +import 'package:paperless_mobile/util.dart'; class CorrespondentWidget extends StatelessWidget { final int? correspondentId; @@ -44,17 +46,21 @@ class CorrespondentWidget extends StatelessWidget { void _addCorrespondentToFilter(BuildContext context) { final cubit = BlocProvider.of(context); - if (cubit.state.filter.correspondent.id == correspondentId) { - cubit.updateCurrentFilter( - (filter) => - filter.copyWith(correspondent: const CorrespondentQuery.unset()), - ); - } else { - cubit.updateCurrentFilter( - (filter) => filter.copyWith( - correspondent: CorrespondentQuery.fromId(correspondentId)), - ); + try { + if (cubit.state.filter.correspondent.id == correspondentId) { + cubit.updateCurrentFilter( + (filter) => + filter.copyWith(correspondent: const CorrespondentQuery.unset()), + ); + } else { + cubit.updateCurrentFilter( + (filter) => filter.copyWith( + correspondent: CorrespondentQuery.fromId(correspondentId)), + ); + } + afterSelected?.call(); + } on ErrorMessage catch (error) { + showError(context, error); } - afterSelected?.call(); } } diff --git a/lib/features/labels/document_type/bloc/document_type_cubit.dart b/lib/features/labels/document_type/bloc/document_type_cubit.dart index 6a5493f..ca534cc 100644 --- a/lib/features/labels/document_type/bloc/document_type_cubit.dart +++ b/lib/features/labels/document_type/bloc/document_type_cubit.dart @@ -1,14 +1,15 @@ +import 'package:flutter/foundation.dart'; import 'package:paperless_mobile/core/bloc/label_cubit.dart'; import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart'; import 'package:injectable/injectable.dart'; @singleton class DocumentTypeCubit extends LabelCubit { - DocumentTypeCubit(super.metaDataService, super.errorCubit); + DocumentTypeCubit(super.metaDataService); @override Future initialize() async { - return labelRepository.getDocumentTypes().then(loadFrom); + labelRepository.getDocumentTypes().then(loadFrom); } @override diff --git a/lib/features/labels/document_type/view/widgets/document_type_widget.dart b/lib/features/labels/document_type/view/widgets/document_type_widget.dart index 0024d4d..6c91c89 100644 --- a/lib/features/labels/document_type/view/widgets/document_type_widget.dart +++ b/lib/features/labels/document_type/view/widgets/document_type_widget.dart @@ -1,9 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/documents/model/query_parameters/document_type_query.dart'; import 'package:paperless_mobile/features/labels/document_type/bloc/document_type_cubit.dart'; import 'package:paperless_mobile/features/labels/document_type/model/document_type.model.dart'; +import 'package:paperless_mobile/util.dart'; class DocumentTypeWidget extends StatelessWidget { final int? documentTypeId; @@ -39,17 +41,21 @@ class DocumentTypeWidget extends StatelessWidget { void _addDocumentTypeToFilter(BuildContext context) { final cubit = BlocProvider.of(context); - if (cubit.state.filter.documentType.id == documentTypeId) { - cubit.updateCurrentFilter( - (filter) => - filter.copyWith(documentType: const DocumentTypeQuery.unset()), - ); - } else { - cubit.updateCurrentFilter( - (filter) => filter.copyWith( - documentType: DocumentTypeQuery.fromId(documentTypeId)), - ); + try { + if (cubit.state.filter.documentType.id == documentTypeId) { + cubit.updateCurrentFilter( + (filter) => + filter.copyWith(documentType: const DocumentTypeQuery.unset()), + ); + } else { + cubit.updateCurrentFilter( + (filter) => filter.copyWith( + documentType: DocumentTypeQuery.fromId(documentTypeId)), + ); + } + afterSelected?.call(); + } on ErrorMessage catch (error) { + showError(context, error); } - afterSelected?.call(); } } diff --git a/lib/features/labels/storage_path/bloc/storage_path_cubit.dart b/lib/features/labels/storage_path/bloc/storage_path_cubit.dart index d484673..efbd203 100644 --- a/lib/features/labels/storage_path/bloc/storage_path_cubit.dart +++ b/lib/features/labels/storage_path/bloc/storage_path_cubit.dart @@ -4,7 +4,7 @@ import 'package:paperless_mobile/features/labels/storage_path/model/storage_path @singleton class StoragePathCubit extends LabelCubit { - StoragePathCubit(super.metaDataService, super.errorCubit); + StoragePathCubit(super.metaDataService); @override Future initialize() async { diff --git a/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart b/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart index ec89fdb..b04c6ea 100644 --- a/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart +++ b/lib/features/labels/storage_path/view/pages/edit_storage_path_page.dart @@ -32,13 +32,19 @@ class EditStoragePathPage extends StatelessWidget { } Future _onDelete(StoragePath path, BuildContext context) async { - await BlocProvider.of(context).remove(path); - final cubit = BlocProvider.of(context); - if (cubit.state.filter.storagePath.id == path.id) { - cubit.updateFilter( - filter: cubit.state.filter - .copyWith(storagePath: const StoragePathQuery.unset())); + try { + await BlocProvider.of(context).remove(path); + final cubit = BlocProvider.of(context); + if (cubit.state.filter.storagePath.id == path.id) { + cubit.updateCurrentFilter( + (filter) => filter.copyWith( + storagePath: const StoragePathQuery.unset(), + ), + ); + } + Navigator.pop(context); + } on ErrorMessage catch (error) { + showError(context, error); } - Navigator.pop(context); } } diff --git a/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart b/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart index f02b946..10acece 100644 --- a/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart +++ b/lib/features/labels/storage_path/view/widgets/storage_path_widget.dart @@ -1,9 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/documents/model/query_parameters/storage_path_query.dart'; import 'package:paperless_mobile/features/labels/storage_path/bloc/storage_path_cubit.dart'; import 'package:paperless_mobile/features/labels/storage_path/model/storage_path.model.dart'; +import 'package:paperless_mobile/util.dart'; class StoragePathWidget extends StatelessWidget { final int? pathId; @@ -43,17 +45,21 @@ class StoragePathWidget extends StatelessWidget { void _addStoragePathToFilter(BuildContext context) { final cubit = BlocProvider.of(context); - if (cubit.state.filter.correspondent.id == pathId) { - cubit.updateCurrentFilter( - (filter) => - filter.copyWith(storagePath: const StoragePathQuery.unset()), - ); - } else { - cubit.updateCurrentFilter( - (filter) => - filter.copyWith(storagePath: StoragePathQuery.fromId(pathId)), - ); + try { + if (cubit.state.filter.correspondent.id == pathId) { + cubit.updateCurrentFilter( + (filter) => + filter.copyWith(storagePath: const StoragePathQuery.unset()), + ); + } else { + cubit.updateCurrentFilter( + (filter) => + filter.copyWith(storagePath: StoragePathQuery.fromId(pathId)), + ); + } + afterSelected?.call(); + } on ErrorMessage catch (error) { + showError(context, error); } - afterSelected?.call(); } } diff --git a/lib/features/labels/tags/bloc/tags_cubit.dart b/lib/features/labels/tags/bloc/tags_cubit.dart index 3c5b886..19e2611 100644 --- a/lib/features/labels/tags/bloc/tags_cubit.dart +++ b/lib/features/labels/tags/bloc/tags_cubit.dart @@ -4,7 +4,7 @@ import 'package:injectable/injectable.dart'; @singleton class TagCubit extends LabelCubit { - TagCubit(super.metaDataService, super.errorCubit); + TagCubit(super.metaDataService); @override Future initialize() async { diff --git a/lib/features/labels/tags/model/tag.model.dart b/lib/features/labels/tags/model/tag.model.dart index b0cec72..01b79de 100644 --- a/lib/features/labels/tags/model/tag.model.dart +++ b/lib/features/labels/tags/model/tag.model.dart @@ -10,6 +10,7 @@ class Tag extends Label { static const colorKey = 'color'; static const isInboxTagKey = 'is_inbox_tag'; static const textColorKey = 'text_color'; + static const legacyColourKey = 'colour'; final Color? color; final Color? textColor; @@ -31,11 +32,23 @@ class Tag extends Label { Tag.fromJson(JSON json) : isInboxTag = json[isInboxTagKey], textColor = Color(_colorStringToInt(json[textColorKey]) ?? 0), - color = (json[colorKey] is Color) - ? json[colorKey] - : Color(_colorStringToInt(json[colorKey]) ?? 0), + color = _parseColorFromJson(json), super.fromJson(json); + /// + /// The `color` field of the json object can either be of type [Color] or a hex [String]. + /// Since API version 2, the old attribute `colour` has been replaced with `color`. + /// + static Color _parseColorFromJson(JSON json) { + if (json.containsKey(legacyColourKey)) { + return Color(_colorStringToInt(json[legacyColourKey]) ?? 0); + } + if (json[colorKey] is Color) { + return json[colorKey]; + } + return Color(_colorStringToInt(json[colorKey]) ?? 0); + } + @override String toString() { return name; diff --git a/lib/features/labels/tags/view/pages/edit_tag_page.dart b/lib/features/labels/tags/view/pages/edit_tag_page.dart index e48995d..8dff9de 100644 --- a/lib/features/labels/tags/view/pages/edit_tag_page.dart +++ b/lib/features/labels/tags/view/pages/edit_tag_page.dart @@ -43,18 +43,22 @@ class EditTagPage extends StatelessWidget { } Future _onDelete(Tag tag, BuildContext context) async { - await BlocProvider.of(context).remove(tag); - final cubit = BlocProvider.of(context); - final currentFilter = cubit.state.filter; - late DocumentFilter updatedFilter = currentFilter; - if (currentFilter.tags.ids.contains(tag.id)) { - updatedFilter = currentFilter.copyWith( - tags: TagsQuery.fromIds( - currentFilter.tags.ids.where((tagId) => tagId != tag.id).toList(), - ), - ); + try { + await BlocProvider.of(context).remove(tag); + final cubit = BlocProvider.of(context); + final currentFilter = cubit.state.filter; + late DocumentFilter updatedFilter = currentFilter; + if (currentFilter.tags.ids.contains(tag.id)) { + updatedFilter = currentFilter.copyWith( + tags: TagsQuery.fromIds( + currentFilter.tags.ids.where((tagId) => tagId != tag.id).toList(), + ), + ); + } + cubit.updateFilter(filter: updatedFilter); + Navigator.pop(context); + } on ErrorMessage catch (error) { + showError(context, error); } - cubit.updateFilter(filter: updatedFilter); - Navigator.pop(context); } } diff --git a/lib/features/labels/tags/view/widgets/tag_widget.dart b/lib/features/labels/tags/view/widgets/tag_widget.dart index 96270a1..b077d79 100644 --- a/lib/features/labels/tags/view/widgets/tag_widget.dart +++ b/lib/features/labels/tags/view/widgets/tag_widget.dart @@ -38,22 +38,27 @@ class TagWidget extends StatelessWidget { void _addTagToFilter(BuildContext context) { final cubit = BlocProvider.of(context); - if (cubit.state.filter.tags.ids.contains(tag.id)) { - cubit.updateCurrentFilter( - (filter) => filter.copyWith( - tags: TagsQuery.fromIds( - cubit.state.filter.tags.ids.where((id) => id != tag.id).toList()), - ), - ); - } else { - cubit.updateCurrentFilter( - (filter) => filter.copyWith( - tags: TagsQuery.fromIds([...cubit.state.filter.tags.ids, tag.id!]), - ), - ); - } - if (afterTagTapped != null) { - afterTagTapped!(); + try { + if (cubit.state.filter.tags.ids.contains(tag.id)) { + cubit.updateCurrentFilter( + (filter) => filter.copyWith( + tags: TagsQuery.fromIds(cubit.state.filter.tags.ids + .where((id) => id != tag.id) + .toList()), + ), + ); + } else { + cubit.updateCurrentFilter( + (filter) => filter.copyWith( + tags: TagsQuery.fromIds([...cubit.state.filter.tags.ids, tag.id!]), + ), + ); + } + if (afterTagTapped != null) { + afterTagTapped!(); + } + } on ErrorMessage catch (error) { + showError(context, error); } } } diff --git a/lib/features/labels/view/pages/edit_label_page.dart b/lib/features/labels/view/pages/edit_label_page.dart index a970bac..f31bf27 100644 --- a/lib/features/labels/view/pages/edit_label_page.dart +++ b/lib/features/labels/view/pages/edit_label_page.dart @@ -3,11 +3,13 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; import 'package:form_builder_validators/form_builder_validators.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/core/type/types.dart'; import 'package:paperless_mobile/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/labels/document_type/model/matching_algorithm.dart'; import 'package:paperless_mobile/features/labels/model/label.model.dart'; import 'package:paperless_mobile/generated/l10n.dart'; +import 'package:paperless_mobile/util.dart'; class EditLabelPage extends StatefulWidget { final T label; @@ -144,6 +146,8 @@ class _EditLabelPageState extends State> { Navigator.pop(context); } on PaperlessValidationErrors catch (errorMessages) { setState(() => _errors = errorMessages); + } on ErrorMessage catch (error) { + showError(context, error); } } } diff --git a/lib/features/labels/view/widgets/label_item.dart b/lib/features/labels/view/widgets/label_item.dart index a0b7cda..0f4e784 100644 --- a/lib/features/labels/view/widgets/label_item.dart +++ b/lib/features/labels/view/widgets/label_item.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart'; import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; @@ -53,10 +52,9 @@ class LabelItem extends StatelessWidget { MaterialPageRoute( builder: (context) => LabelBlocProvider( child: BlocProvider( - create: (context) => DocumentsCubit( - getIt(), - getIt()) - ..updateFilter(filter: filter), + create: (context) => + DocumentsCubit(getIt()) + ..updateFilter(filter: filter), child: LinkedDocumentsPreview(filter: filter), ), ), diff --git a/lib/features/login/bloc/authentication_cubit.dart b/lib/features/login/bloc/authentication_cubit.dart index 44a2c76..7d50760 100644 --- a/lib/features/login/bloc/authentication_cubit.dart +++ b/lib/features/login/bloc/authentication_cubit.dart @@ -1,7 +1,7 @@ +import 'dart:developer'; import 'dart:io'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/core/store/local_vault.dart'; import 'package:paperless_mobile/di_initializer.dart'; @@ -17,13 +17,11 @@ const authenticationKey = "authentication"; @singleton class AuthenticationCubit extends Cubit { final LocalVault localStore; - final GlobalErrorCubit errorCubit; final AuthenticationService authenticationService; AuthenticationCubit( this.localStore, this.authenticationService, - this.errorCubit, ) : super(AuthenticationState.initial); Future initialize() { @@ -34,7 +32,6 @@ class AuthenticationCubit extends Cubit { required UserCredentials credentials, required String serverUrl, ClientCertificate? clientCertificate, - bool propagateEventOnError = true, }) async { assert(credentials.username != null && credentials.password != null); try { @@ -75,49 +72,37 @@ class AuthenticationCubit extends Cubit { } on TlsException catch (_) { const error = ErrorMessage(ErrorCode.invalidClientCertificateConfiguration); - if (propagateEventOnError) { - errorCubit.add(error); - } throw error; - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); + } on SocketException catch (err) { + if (err.message.contains("connection timed out")) { + throw const ErrorMessage(ErrorCode.requestTimedOut); + } else { + throw ErrorMessage.unknown(); } - rethrow; } } - Future restoreSessionState({ - bool propagateEventOnError = true, - }) async { - try { - final storedAuth = await localStore.loadAuthenticationInformation(); - final appSettings = await localStore.loadApplicationSettings() ?? - ApplicationSettingsState.defaultSettings; + Future restoreSessionState() async { + final storedAuth = await localStore.loadAuthenticationInformation(); + final appSettings = await localStore.loadApplicationSettings() ?? + ApplicationSettingsState.defaultSettings; - if (storedAuth == null || !storedAuth.isValid) { + if (storedAuth == null || !storedAuth.isValid) { + emit(AuthenticationState(isAuthenticated: false, wasLoginStored: false)); + } else { + if (!appSettings.isLocalAuthenticationEnabled || + await authenticationService + .authenticateLocalUser("Authenticate to log back in")) { + registerSecurityContext(storedAuth.clientCertificate); emit( - AuthenticationState(isAuthenticated: false, wasLoginStored: false)); + AuthenticationState( + isAuthenticated: true, + wasLoginStored: true, + authentication: storedAuth, + ), + ); } else { - if (!appSettings.isLocalAuthenticationEnabled || - await authenticationService - .authenticateLocalUser("Authenticate to log back in")) { - registerSecurityContext(storedAuth.clientCertificate); - emit( - AuthenticationState( - isAuthenticated: true, - wasLoginStored: true, - authentication: storedAuth, - ), - ); - } else { - emit(AuthenticationState( - isAuthenticated: false, wasLoginStored: true)); - } - } - } on ErrorMessage catch (error) { - if (propagateEventOnError) { - errorCubit.add(error); + emit(AuthenticationState(isAuthenticated: false, wasLoginStored: true)); } } } diff --git a/lib/features/login/services/authentication.service.dart b/lib/features/login/services/authentication.service.dart index c4c02c0..52943fc 100644 --- a/lib/features/login/services/authentication.service.dart +++ b/lib/features/login/services/authentication.service.dart @@ -26,10 +26,19 @@ class AuthenticationService { required String password, required String serverUrl, }) async { - final response = await httpClient.post( - Uri.parse("/api/token/"), - body: {"username": username, "password": password}, - ); + late Response response; + try { + response = await httpClient.post( + Uri.parse("/api/token/"), + body: {"username": username, "password": password}, + ); + } on FormatException catch (e) { + final source = e.source; + if (source is String && + source.contains("400 No required SSL certificate was sent")) { + throw const ErrorMessage(ErrorCode.missingClientCertificate); + } + } if (response.statusCode == 200) { final data = jsonDecode(utf8.decode(response.bodyBytes)); return data['token']; diff --git a/lib/features/login/view/login_page.dart b/lib/features/login/view/login_page.dart index 0dfddee..809381a 100644 --- a/lib/features/login/view/login_page.dart +++ b/lib/features/login/view/login_page.dart @@ -1,12 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; import 'package:paperless_mobile/extensions/flutter_extensions.dart'; import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart'; import 'package:paperless_mobile/features/login/view/widgets/client_certificate_form_field.dart'; import 'package:paperless_mobile/features/login/view/widgets/server_address_form_field.dart'; import 'package:paperless_mobile/features/login/view/widgets/user_credentials_form_field.dart'; import 'package:paperless_mobile/generated/l10n.dart'; +import 'package:paperless_mobile/util.dart'; class LoginPage extends StatefulWidget { const LoginPage({Key? key}) : super(key: key); @@ -72,7 +74,8 @@ class _LoginPageState extends State { return ElevatedButton( style: ButtonStyle( backgroundColor: MaterialStatePropertyAll( - Theme.of(context).colorScheme.primaryContainer), + Theme.of(context).colorScheme.primaryContainer, + ), elevation: const MaterialStatePropertyAll(0), ), onPressed: _login, @@ -82,19 +85,25 @@ class _LoginPageState extends State { ); } - void _login() { + void _login() async { FocusScope.of(context).unfocus(); if (_formKey.currentState?.saveAndValidate() ?? false) { setState(() => _isLoginLoading = true); - final form = _formKey.currentState?.value; - BlocProvider.of(context) - .login( - credentials: form?[UserCredentialsFormField.fkCredentials], - serverUrl: form?[ServerAddressFormField.fkServerAddress], - clientCertificate: - form?[ClientCertificateFormField.fkClientCertificate], - ) - .whenComplete(() => setState(() => _isLoginLoading = false)); + final form = _formKey.currentState!.value; + try { + await BlocProvider.of(context).login( + credentials: form[UserCredentialsFormField.fkCredentials], + serverUrl: form[ServerAddressFormField.fkServerAddress], + clientCertificate: + form[ClientCertificateFormField.fkClientCertificate], + ); + } on ErrorMessage catch (error) { + showError(context, error); + } catch (unknownError) { + showSnackBar(context, unknownError.toString()); + } finally { + setState(() => _isLoginLoading = false); + } } } } diff --git a/lib/features/scan/bloc/document_scanner_cubit.dart b/lib/features/scan/bloc/document_scanner_cubit.dart index 3be042b..92f263d 100644 --- a/lib/features/scan/bloc/document_scanner_cubit.dart +++ b/lib/features/scan/bloc/document_scanner_cubit.dart @@ -1,5 +1,7 @@ +import 'dart:developer'; import 'dart:io'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; @@ -20,15 +22,22 @@ class DocumentScannerCubit extends Cubit> { scans.removeAt(fileIndex); emit(scans); } catch (_) { - addError(const ErrorMessage(ErrorCode.scanRemoveFailed)); + throw const ErrorMessage(ErrorCode.scanRemoveFailed); } } void reset() { - for (final doc in state) { - doc.deleteSync(); + try { + for (final doc in state) { + doc.deleteSync(); + if (kDebugMode) { + log('[ScannerCubit]: Removed ${doc.path}'); + } + } + imageCache.clear(); + emit(initialState); + } catch (_) { + throw const ErrorMessage(ErrorCode.scanRemoveFailed); } - imageCache.clear(); - emit(initialState); } } diff --git a/lib/features/scan/view/document_upload_page.dart b/lib/features/scan/view/document_upload_page.dart index 908335b..cf51e16 100644 --- a/lib/features/scan/view/document_upload_page.dart +++ b/lib/features/scan/view/document_upload_page.dart @@ -30,10 +30,11 @@ import 'package:intl/intl.dart'; class DocumentUploadPage extends StatefulWidget { final Uint8List fileBytes; - + final void Function()? afterUpload; const DocumentUploadPage({ Key? key, required this.fileBytes, + this.afterUpload, }) : super(key: key); @override @@ -184,50 +185,33 @@ class _DocumentUploadPageState extends State { } void _onSubmit() async { - _formKey.currentState?.save(); - if (_formKey.currentState?.validate() ?? false) { + if (_formKey.currentState?.saveAndValidate() ?? false) { try { - setState(() { - _isUploadLoading = true; - }); + setState(() => _isUploadLoading = true); + + final fv = _formKey.currentState!.value; + + final createdAt = fv[DocumentModel.createdKey] as DateTime?; + final title = fv[DocumentModel.titleKey] as String; + final docType = fv[DocumentModel.documentTypeKey] as IdQueryParameter; + final tags = fv[DocumentModel.tagsKey] as TagsQuery; + final correspondent = + fv[DocumentModel.correspondentKey] as IdQueryParameter; + await BlocProvider.of(context).addDocument( widget.fileBytes, _formKey.currentState?.value[fkFileName], - onConsumptionFinished: (document) { - ScaffoldMessenger.of(rootScaffoldKey.currentContext!).showSnackBar( - SnackBar( - action: SnackBarAction( - onPressed: () { - getIt().reloadDocuments(); - }, - label: S - .of(context) - .documentUploadProcessingSuccessfulReloadActionText, - ), - content: - Text(S.of(context).documentUploadProcessingSuccessfulText), - ), - ); - }, - title: _formKey.currentState?.value[DocumentModel.titleKey], - documentType: (_formKey.currentState - ?.value[DocumentModel.documentTypeKey] as IdQueryParameter) - .id, - correspondent: (_formKey.currentState - ?.value[DocumentModel.correspondentKey] as IdQueryParameter) - .id, - tags: - (_formKey.currentState?.value[DocumentModel.tagsKey] as TagsQuery) - .ids, - createdAt: (_formKey.currentState?.value[DocumentModel.createdKey] - as DateTime?), + onConsumptionFinished: _onConsumptionFinished, + title: title, + documentType: docType.id, + correspondent: correspondent.id, + tags: tags.ids, + createdAt: createdAt, ); - setState(() { - _isUploadLoading = false; - }); - getIt().reset(); - Navigator.pop(context); + getIt().reset(); //TODO: Access via provider showSnackBar(context, S.of(context).documentUploadSuccessText); + Navigator.pop(context); + widget.afterUpload?.call(); } on ErrorMessage catch (error) { showError(context, error); } on PaperlessValidationErrors catch (errorMessages) { @@ -236,9 +220,28 @@ class _DocumentUploadPageState extends State { showSnackBar(context, other.toString()); } finally { setState(() { - _isUploadLoading = true; + _isUploadLoading = false; }); } } } + + void _onConsumptionFinished(document) { + ScaffoldMessenger.of(rootScaffoldKey.currentContext!).showSnackBar( + SnackBar( + action: SnackBarAction( + onPressed: () async { + try { + getIt().reloadDocuments(); + } on ErrorMessage catch (error) { + showError(context, error); + } + }, + label: + S.of(context).documentUploadProcessingSuccessfulReloadActionText, + ), + content: Text(S.of(context).documentUploadProcessingSuccessfulText), + ), + ); + } } diff --git a/lib/features/scan/view/scanner_page.dart b/lib/features/scan/view/scanner_page.dart index 7230b16..0c994d5 100644 --- a/lib/features/scan/view/scanner_page.dart +++ b/lib/features/scan/view/scanner_page.dart @@ -1,3 +1,4 @@ +import 'dart:developer' as dev; import 'dart:io'; import 'dart:math'; @@ -8,7 +9,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:mime/mime.dart'; import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart'; +import 'package:paperless_mobile/core/global/constants.dart'; import 'package:paperless_mobile/core/model/error_message.dart'; +import 'package:paperless_mobile/core/service/file_service.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart'; @@ -30,16 +33,9 @@ class ScannerPage extends StatefulWidget { class _ScannerPageState extends State with SingleTickerProviderStateMixin { - static const _supportedExtensions = [ - 'pdf', - 'png', - 'tiff', - 'gif', - 'jpg', - 'jpeg' - ]; late final AnimationController _fabPulsingController; late final Animation _animation; + @override void initState() { super.initState(); @@ -47,9 +43,7 @@ class _ScannerPageState extends State AnimationController(vsync: this, duration: const Duration(seconds: 1)) ..repeat(reverse: true); _animation = Tween(begin: 1.0, end: 1.2).animate(_fabPulsingController) - ..addListener(() { - setState(() {}); - }); + ..addListener(() => setState((() {}))); } @override @@ -101,7 +95,9 @@ class _ScannerPageState extends State BlocBuilder>( builder: (context, state) { return IconButton( - onPressed: state.isEmpty ? null : () => _export(context), + onPressed: state.isEmpty + ? null + : () => _onPrepareDocumentUpload(context), icon: const Icon(Icons.done), tooltip: S.of(context).documentScannerPageUploadButtonTooltip, ); @@ -113,17 +109,31 @@ class _ScannerPageState extends State void _openDocumentScanner(BuildContext context) async { await _requestCameraPermissions(); - final imagePath = await EdgeDetection.detectEdge; - if (imagePath == null) { + final file = await FileService.allocateTemporaryFile( + PaperlessDirectoryType.scans, + extension: 'jpeg', + ); + if (kDebugMode) { + dev.log('[ScannerPage] Created temporary file: ${file.path}'); + } + final success = await EdgeDetection.detectEdge(file.path); + if (!success) { + if (kDebugMode) { + dev.log( + '[ScannerPage] Scan either not successful or canceled by user.'); + } return; } - final file = File(imagePath); + if (kDebugMode) { + dev.log('[ScannerPage] Wrote image to temporary file: ${file.path}'); + } BlocProvider.of(context).addScan(file); } - void _export(BuildContext context) async { + void _onPrepareDocumentUpload(BuildContext context) async { final doc = _buildDocumentFromImageFiles( - BlocProvider.of(context).state); + BlocProvider.of(context).state, + ); final bytes = await doc.save(); Navigator.of(context).push( MaterialPageRoute( @@ -187,8 +197,14 @@ class _ScannerPageState extends State itemBuilder: (context, index) { return GridImageItemWidget( file: scans[index], - onDelete: () => BlocProvider.of(context) - .removeScan(index), + onDelete: () async { + try { + BlocProvider.of(context) + .removeScan(index); + } on ErrorMessage catch (error) { + showError(context, error); + } + }, index: index, totalNumberOfFiles: scans.length, ); @@ -196,25 +212,32 @@ class _ScannerPageState extends State } void _reset(BuildContext context) { - BlocProvider.of(context).reset(); + try { + BlocProvider.of(context).reset(); + } on ErrorMessage catch (error) { + showError(context, error); + } } Future _requestCameraPermissions() async { final hasPermission = await Permission.camera.isGranted; if (!hasPermission) { - Permission.camera.request(); + await Permission.camera.request(); } } void _onUploadFromFilesystem() async { FilePickerResult? result = await FilePicker.platform.pickFiles( type: FileType.custom, - allowedExtensions: _supportedExtensions, + allowedExtensions: supportedFileExtensions, withData: true, ); if (result?.files.single.path != null) { File file = File(result!.files.single.path!); - + if (!supportedFileExtensions.contains(file.path.split('.').last)) { + //TODO: Show error message; + return; + } final mimeType = lookupMimeType(file.path) ?? ''; late Uint8List fileBytes; if (mimeType.startsWith('image')) { diff --git a/lib/features/settings/view/pages/storage_settings_page.dart b/lib/features/settings/view/pages/storage_settings_page.dart new file mode 100644 index 0000000..0aefad0 --- /dev/null +++ b/lib/features/settings/view/pages/storage_settings_page.dart @@ -0,0 +1,21 @@ +import 'package:flutter/material.dart'; +import 'package:paperless_mobile/features/settings/view/widgets/clear_storage_setting.dart'; +import 'package:paperless_mobile/generated/l10n.dart'; + +class StorageSettingsPage extends StatelessWidget { + const StorageSettingsPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text(S.of(context).settingsPageStorageSettingsLabel), + ), + body: ListView( + children: const [ + ClearStorageSetting(), + ], + ), + ); + } +} diff --git a/lib/features/settings/view/settings_page.dart b/lib/features/settings/view/settings_page.dart index bf8c8b7..68b4d0a 100644 --- a/lib/features/settings/view/settings_page.dart +++ b/lib/features/settings/view/settings_page.dart @@ -3,16 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart'; import 'package:paperless_mobile/features/settings/view/pages/application_settings_page.dart'; import 'package:paperless_mobile/features/settings/view/pages/security_settings_page.dart'; +import 'package:paperless_mobile/features/settings/view/pages/storage_settings_page.dart'; import 'package:paperless_mobile/generated/l10n.dart'; -class SettingsPage extends StatefulWidget { +class SettingsPage extends StatelessWidget { const SettingsPage({super.key}); - @override - State createState() => _SettingsPageState(); -} - -class _SettingsPageState extends State { @override Widget build(BuildContext context) { return Scaffold( @@ -25,20 +21,26 @@ class _SettingsPageState extends State { title: Text(S.of(context).settingsPageApplicationSettingsLabel), subtitle: Text( S.of(context).settingsPageApplicationSettingsDescriptionText), - onTap: () => _goto(const ApplicationSettingsPage()), + onTap: () => _goto(const ApplicationSettingsPage(), context), ), ListTile( title: Text(S.of(context).settingsPageSecuritySettingsLabel), subtitle: Text(S.of(context).settingsPageSecuritySettingsDescriptionText), - onTap: () => _goto(const SecuritySettingsPage()), + onTap: () => _goto(const SecuritySettingsPage(), context), + ), + ListTile( + title: Text(S.of(context).settingsPageStorageSettingsLabel), + subtitle: + Text(S.of(context).settingsPageStorageSettingsDescriptionText), + onTap: () => _goto(const StorageSettingsPage(), context), ), ], ), ); } - void _goto(Widget page) { + void _goto(Widget page, BuildContext context) { Navigator.push( context, MaterialPageRoute( diff --git a/lib/features/settings/view/widgets/clear_storage_setting.dart b/lib/features/settings/view/widgets/clear_storage_setting.dart new file mode 100644 index 0000000..e4cc2bf --- /dev/null +++ b/lib/features/settings/view/widgets/clear_storage_setting.dart @@ -0,0 +1,23 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_cache_manager/flutter_cache_manager.dart' as cm; +import 'package:paperless_mobile/core/service/file_service.dart'; +import 'package:paperless_mobile/di_initializer.dart'; + +class ClearStorageSetting extends StatelessWidget { + const ClearStorageSetting({super.key}); + + @override + Widget build(BuildContext context) { + return ListTile( + title: Text("Clear data"), + subtitle: + Text("Remove downloaded files, scans and clear the cache's content"), + onTap: _clearCache, + ); + } + + void _clearCache() async { + getIt().emptyCache(); + FileService.clearUserData(); + } +} diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 1a41c98..d195541 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -102,7 +102,7 @@ "documentScannerPageTitle": "Scanner", "documentScannerPageResetButtonTooltipText": "Alle scans löschen", "documentScannerPageUploadButtonTooltip": "Dokument hochladen", - "documentScannerPageAddScanButtonLabel": "Scanne ein Dokument", + "documentScannerPageAddScanButtonLabel": "Scanne ein Dokument", "documentScannerPageOrText": "oder", "documentScannerPageUploadFromThisDeviceButtonLabel": "Lade ein Dokument von diesem Gerät hoch", "addTagPageTitle": "Neuer Tag", @@ -185,6 +185,9 @@ "labelsPageStoragePathEmptyStateDescriptionText": "Es wurden noch keine Speicherpfade angelegt.", "referencedDocumentsReadOnlyHintText": "Dies ist eine schreibgeschützte Ansicht! Dokumente können nicht bearbeitet oder entfernt werden.", "editLabelPageConfirmDeletionDialogTitle": "Löschen bestätigen", - "editLabelPageDeletionDialogText": "Dieser Kennzeichner wird von Dokumenten referenziert. Durch das Löschen dieses Kennzeichners werden alle Referenzen entfernt. Fortfahren?" - + "editLabelPageDeletionDialogText": "Dieser Kennzeichner wird von Dokumenten referenziert. Durch das Löschen dieses Kennzeichners werden alle Referenzen entfernt. Fortfahren?", + "settingsPageStorageSettingsLabel": "Storage", + "settingsPageStorageSettingsDescriptionText": "Manage files and storage space", + "documentUpdateErrorMessage": "Document successfully updated.", + "errorMessageMissingClientCertificate": "Ein Client Zerfitikat wurde erwartet, aber nicht gesendet. Bitte konfiguriere ein gültiges Zertifikat." } \ No newline at end of file diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 6c2aa03..451f54b 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -186,5 +186,9 @@ "labelsPageStoragePathEmptyStateDescriptionText": "You don't seem to have any storage paths set up.", "referencedDocumentsReadOnlyHintText": "This is a read-only view! You cannot edit or remove documents.", "editLabelPageConfirmDeletionDialogTitle": "Confirm deletion", - "editLabelPageDeletionDialogText": "This label contains references to other documents. By deleting this label, all references will be removed. Continue?" + "editLabelPageDeletionDialogText": "This label contains references to other documents. By deleting this label, all references will be removed. Continue?", + "settingsPageStorageSettingsLabel": "Storage", + "settingsPageStorageSettingsDescriptionText": "Manage files and storage space", + "documentUpdateErrorMessage": "Document successfully updated.", + "errorMessageMissingClientCertificate": "A client certificate was expected but not sent. Please provide a valid client certificate." } \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 6b96f47..b22adc7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,19 +1,29 @@ +import 'dart:developer'; import 'dart:io'; +import 'package:encrypted_shared_preferences/encrypted_shared_preferences.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_native_splash/flutter_native_splash.dart'; import 'package:paperless_mobile/core/bloc/connectivity_cubit.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart'; import 'package:paperless_mobile/core/global/asset_images.dart'; +import 'package:paperless_mobile/core/global/constants.dart'; import 'package:paperless_mobile/core/global/http_self_signed_certificate_override.dart'; +import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart'; +import 'package:paperless_mobile/core/model/error_message.dart'; +import 'package:paperless_mobile/core/service/file_service.dart'; +import 'package:paperless_mobile/core/util.dart'; import 'package:paperless_mobile/di_initializer.dart'; import 'package:paperless_mobile/features/app_intro/application_intro_slideshow.dart'; +import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/home/view/home_page.dart'; import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart'; import 'package:paperless_mobile/features/login/view/login_page.dart'; +import 'package:paperless_mobile/features/scan/view/document_upload_page.dart'; import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart'; import 'package:paperless_mobile/features/settings/model/application_settings_state.dart'; import 'package:paperless_mobile/generated/l10n.dart'; @@ -23,6 +33,7 @@ import 'package:intl/intl.dart'; import 'package:intl/intl_standalone.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:path_provider/path_provider.dart'; +import 'package:receive_sharing_intent/receive_sharing_intent.dart'; void main() async { final widgetsBinding = WidgetsFlutterBinding.ensureInitialized(); @@ -34,8 +45,10 @@ void main() async { configureDependencies(); // Remove temporarily downloaded files. - (await getTemporaryDirectory()).deleteSync(recursive: true); - + (await FileService.temporaryDirectory).deleteSync(recursive: true); + if (kDebugMode) { + _printDeviceInformation(); + } kPackageInfo = await PackageInfo.fromPlatform(); // Load application settings and stored authentication data getIt().initialize(); @@ -45,6 +58,17 @@ void main() async { runApp(const MyApp()); } +void _printDeviceInformation() async { + final tempPath = await FileService.temporaryDirectory; + log('[DEVICE INFO] Temporary ${tempPath.absolute}'); + final docsPath = await FileService.documentsDirectory; + log('[DEVICE INFO] Documents ${docsPath?.absolute}'); + final downloadPath = await FileService.downloadsDirectory; + log('[DEVICE INFO] Download ${downloadPath?.absolute}'); + final scanPath = await FileService.scanDirectory; + log('[DEVICE INFO] Scan ${scanPath?.absolute}'); +} + class MyApp extends StatefulWidget { const MyApp({Key? key}) : super(key: key); @@ -125,6 +149,48 @@ class AuthenticationWrapper extends StatefulWidget { } class _AuthenticationWrapperState extends State { + bool isFileTypeSupported(SharedMediaFile file) { + return supportedFileExtensions.contains(file.path.split('.').last); + } + + void handleReceivedFiles(List files) async { + if (files.isEmpty) { + return; + } + if (!isFileTypeSupported(files.first)) { + showError(context, const ErrorMessage(ErrorCode.unsupportedFileFormat)); + await Future.delayed( + const Duration(seconds: 2), + () => SystemNavigator.pop(), + ); + } + final bytes = File(files.first.path).readAsBytesSync(); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => BlocProvider.value( + value: getIt(), + child: LabelBlocProvider( + child: DocumentUploadPage( + fileBytes: bytes, + afterUpload: () => SystemNavigator.pop(), + ), + ), + ), + ), + ); + } + + @override + void initState() { + super.initState(); + // For sharing files coming from outside the app while the app is still opened + ReceiveSharingIntent.getMediaStream().listen(handleReceivedFiles); + + // For sharing files coming from outside the app while the app is closed + ReceiveSharingIntent.getInitialMedia().then(handleReceivedFiles); + } + @override void didChangeDependencies() { FlutterNativeSplash.remove(); @@ -136,40 +202,37 @@ class _AuthenticationWrapperState extends State { @override Widget build(BuildContext context) { - return BlocProvider.value( - value: getIt(), - child: SafeArea( - top: true, - left: false, - right: false, - bottom: false, - child: BlocConsumer( - listener: (context, authState) { - final bool showIntroSlider = - authState.isAuthenticated && !authState.wasLoginStored; - if (showIntroSlider) { - for (final img in AssetImages.values) { - img.load(context); - } - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => const ApplicationIntroSlideshow(), - fullscreenDialog: true, - ), - ); + return SafeArea( + top: true, + left: false, + right: false, + bottom: false, + child: BlocConsumer( + listener: (context, authState) { + final bool showIntroSlider = + authState.isAuthenticated && !authState.wasLoginStored; + if (showIntroSlider) { + for (final img in AssetImages.values) { + img.load(context); } - }, - builder: (context, authentication) { - if (authentication.isAuthenticated) { - return const LabelBlocProvider( - child: HomePage(), - ); - } else { - return const LoginPage(); - } - }, - ), + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const ApplicationIntroSlideshow(), + fullscreenDialog: true, + ), + ); + } + }, + builder: (context, authentication) { + if (authentication.isAuthenticated) { + return const LabelBlocProvider( + child: HomePage(), + ); + } else { + return const LoginPage(); + } + }, ), ); } diff --git a/lib/util.dart b/lib/util.dart index 669ea58..e6a35cc 100644 --- a/lib/util.dart +++ b/lib/util.dart @@ -13,12 +13,14 @@ final dateFormat = DateFormat("yyyy-MM-dd"); final GlobalKey rootScaffoldKey = GlobalKey(); late PackageInfo kPackageInfo; -void showSnackBar(BuildContext context, String message) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message))); +void showSnackBar(BuildContext context, String message, [String? details]) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text(message + (details != null ? ' ($details)' : ''))), + ); } void showError(BuildContext context, ErrorMessage error) { - showSnackBar(context, translateError(context, error.code)); + showSnackBar(context, translateError(context, error.code), error.details); } bool isNotNull(dynamic value) { diff --git a/pubspec.lock b/pubspec.lock index 351e782..050e6d9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -354,10 +354,12 @@ packages: edge_detection: dependency: "direct main" description: - name: edge_detection - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.9" + path: "." + ref: master + resolved-ref: "19fbebef99360e9cf0b59c6a90ff7cd26d4d6e7d" + url: "https://github.com/sawankumarbundelkhandi/edge_detection" + source: git + version: "1.1.1" encrypt: dependency: transitive description: @@ -1123,6 +1125,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.1" + receive_sharing_intent: + dependency: "direct main" + description: + name: receive_sharing_intent + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.5" rxdart: dependency: transitive description: @@ -1458,7 +1467,7 @@ packages: source: hosted version: "3.0.1" uuid: - dependency: transitive + dependency: "direct main" description: name: uuid url: "https://pub.dartlang.org" diff --git a/pubspec.yaml b/pubspec.yaml index 645e9d2..3fa6112 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,10 @@ dependencies: permission_handler: ^9.2.0 pdf: ^3.8.1 pdfx: ^2.3.0 - edge_detection: ^1.0.9 + edge_detection: + git: + url: https://github.com/sawankumarbundelkhandi/edge_detection + ref: master path_provider: ^2.0.10 image: ^3.1.3 photo_view: ^0.14.0 @@ -74,6 +77,8 @@ dependencies: share_plus: ^6.2.0 introduction_screen: ^3.0.2 mime: ^1.0.2 + receive_sharing_intent: ^1.4.5 + uuid: ^3.0.6 dev_dependencies: integration_test: diff --git a/resources/get_it_on_google_play_en.svg b/resources/get_it_on_google_play_en.svg new file mode 100644 index 0000000..e3382f2 --- /dev/null +++ b/resources/get_it_on_google_play_en.svg @@ -0,0 +1 @@ +fil_get \ No newline at end of file diff --git a/test/src/bloc/document_cubit_test.dart b/test/src/bloc/document_cubit_test.dart index ad776c6..3a1ea64 100644 --- a/test/src/bloc/document_cubit_test.dart +++ b/test/src/bloc/document_cubit_test.dart @@ -1,5 +1,4 @@ import 'package:bloc_test/bloc_test.dart'; -import 'package:paperless_mobile/core/bloc/global_error_cubit.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart'; import 'package:paperless_mobile/features/documents/bloc/documents_state.dart'; import 'package:paperless_mobile/features/documents/model/document.model.dart'; @@ -15,32 +14,32 @@ import 'package:mockito/mockito.dart'; import '../../utils.dart'; @GenerateNiceMocks([MockSpec()]) -@GenerateNiceMocks([MockSpec()]) import 'document_cubit_test.mocks.dart'; void main() async { TestWidgetsFlutterBinding.ensureInitialized(); final List documents = List.unmodifiable( - await loadCollection("test/fixtures/documents/documents.json", DocumentModel.fromJson), + await loadCollection( + "test/fixtures/documents/documents.json", DocumentModel.fromJson), ); final List tags = List.unmodifiable( await loadCollection("test/fixtures/tags/tags.json", Tag.fromJson), ); final List correspondents = List.unmodifiable( - await loadCollection( - "test/fixtures/correspondents/correspondents.json", Correspondent.fromJson), + await loadCollection("test/fixtures/correspondents/correspondents.json", + Correspondent.fromJson), ); final List documentTypes = List.unmodifiable( - await loadCollection("test/fixtures/document_types/document_types.json", DocumentType.fromJson), + await loadCollection("test/fixtures/document_types/document_types.json", + DocumentType.fromJson), ); final MockDocumentRepository documentRepository = MockDocumentRepository(); - final MockGlobalErrorCubit globalErrorCubit = MockGlobalErrorCubit(); group("Test DocumentsCubit reloadDocuments", () { test("Assert correct initial state", () { - expect(DocumentsCubit(documentRepository, globalErrorCubit).state, DocumentsState.initial); + expect(DocumentsCubit(documentRepository).state, DocumentsState.initial); }); blocTest( @@ -53,7 +52,7 @@ void main() async { results: documents, ), ), - build: () => DocumentsCubit(documentRepository, globalErrorCubit), + build: () => DocumentsCubit(documentRepository), seed: () => DocumentsState.initial, act: (bloc) => bloc.loadDocuments(), expect: () => [ @@ -82,7 +81,7 @@ void main() async { results: documents, ), ), - build: () => DocumentsCubit(documentRepository, globalErrorCubit), + build: () => DocumentsCubit(documentRepository), seed: () => DocumentsState.initial, act: (bloc) => bloc.loadDocuments(), expect: () => [