Added ios support for receive_sharing_intent, some consistency fixes and bug fixes

This commit is contained in:
Anton Stubenbord
2022-11-21 23:47:27 +01:00
parent 2a545dba7c
commit a7295fb739
34 changed files with 865 additions and 71 deletions

View File

@@ -235,7 +235,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
try {
await BlocProvider.of<DocumentsCubit>(context).assignAsn(document);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
@@ -410,7 +410,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
await BlocProvider.of<DocumentsCubit>(context).removeDocument(document);
showSnackBar(context, S.of(context).documentDeleteSuccessMessage);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
} finally {
Navigator.pop(context);
}

View File

@@ -84,7 +84,7 @@ class _DocumentEditPageState extends State<DocumentEditPage> {
await getIt<DocumentsCubit>().updateDocument(updatedDocument);
showSnackBar(context, S.of(context).documentUpdateErrorMessage);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
} finally {
Navigator.pop(context);
}

View File

@@ -53,7 +53,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
try {
BlocProvider.of<DocumentsCubit>(context).loadDocuments();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
@@ -73,7 +73,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
try {
await documentsCubit.loadMore();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
@@ -87,7 +87,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
(filter) => filter.copyWith(page: 1),
);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}

View File

@@ -476,7 +476,7 @@ class _DocumentFilterPanelState extends State<DocumentFilterPanel> {
FocusScope.of(context).unfocus();
widget.panelController.close();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -105,7 +105,7 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
S.of(context).documentsPageBulkDeleteSuccessfulText,
);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -88,7 +88,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
try {
await BlocProvider.of<SavedViewCubit>(context).add(newView);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}
@@ -105,7 +105,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
BlocProvider.of<SavedViewCubit>(context).selectView(null);
}
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
@@ -120,7 +120,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
try {
BlocProvider.of<SavedViewCubit>(context).remove(view);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -83,7 +83,7 @@ class _HomePageState extends State<HomePage> {
BlocProvider.of<StoragePathCubit>(context).initialize();
BlocProvider.of<SavedViewCubit>(context).initialize();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -19,7 +19,7 @@ class BottomNavBar extends StatelessWidget {
selectedIndex: selectedIndex,
destinations: [
NavigationDestination(
icon: const Icon(Icons.description),
icon: const Icon(Icons.description_outlined),
selectedIcon: Icon(
Icons.description,
color: Theme.of(context).colorScheme.primary,
@@ -27,7 +27,7 @@ class BottomNavBar extends StatelessWidget {
label: S.of(context).bottomNavDocumentsPageLabel,
),
NavigationDestination(
icon: const Icon(Icons.document_scanner),
icon: const Icon(Icons.document_scanner_outlined),
selectedIcon: Icon(
Icons.document_scanner,
color: Theme.of(context).colorScheme.primary,
@@ -35,9 +35,7 @@ class BottomNavBar extends StatelessWidget {
label: S.of(context).bottomNavScannerPageLabel,
),
NavigationDestination(
icon: const Icon(
Icons.sell,
),
icon: const Icon(Icons.sell_outlined),
selectedIcon: Icon(
Icons.sell,
color: Theme.of(context).colorScheme.primary,

View File

@@ -191,7 +191,7 @@ class InfoDrawer extends StatelessWidget {
getIt<TagCubit>().reset();
getIt<DocumentScannerCubit>().reset();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
},
),

View File

@@ -39,7 +39,7 @@ class EditCorrespondentPage extends StatelessWidget {
}
Navigator.pop(context);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -60,7 +60,7 @@ class CorrespondentWidget extends StatelessWidget {
}
afterSelected?.call();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -55,7 +55,7 @@ class DocumentTypeWidget extends StatelessWidget {
}
afterSelected?.call();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -44,7 +44,7 @@ class EditStoragePathPage extends StatelessWidget {
}
Navigator.pop(context);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -59,7 +59,7 @@ class StoragePathWidget extends StatelessWidget {
}
afterSelected?.call();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -60,7 +60,7 @@ class EditTagPage extends StatelessWidget {
cubit.updateFilter(filter: updatedFilter);
Navigator.pop(context);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -65,7 +65,7 @@ class TagWidget extends StatelessWidget {
afterTagTapped!();
}
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -147,7 +147,7 @@ class _EditLabelPageState<T extends Label> extends State<EditLabelPage<T>> {
} on PaperlessValidationErrors catch (errorMessages) {
setState(() => _errors = errorMessages);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
}

View File

@@ -98,9 +98,11 @@ class _LoginPageState extends State<LoginPage> {
form[ClientCertificateFormField.fkClientCertificate],
);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
} on Map<String, dynamic> catch (error, stackTrace) {
showGenericError(context, error.values.first, stackTrace);
} catch (unknownError, stackTrace) {
showError(context, ErrorMessage.unknown(), stackTrace);
showErrorMessage(context, ErrorMessage.unknown(), stackTrace);
} finally {
setState(() => _isLoginLoading = false);
}

View File

@@ -30,11 +30,16 @@ import 'package:intl/intl.dart';
class DocumentUploadPage extends StatefulWidget {
final Uint8List fileBytes;
final String? title;
final String? filename;
final void Function()? afterUpload;
const DocumentUploadPage({
Key? key,
required this.fileBytes,
this.afterUpload,
this.title,
this.filename,
}) : super(key: key);
@override
@@ -42,18 +47,21 @@ class DocumentUploadPage extends StatefulWidget {
}
class _DocumentUploadPageState extends State<DocumentUploadPage> {
static const fkFileName = "fileName";
static const fkFileName = "filename";
static final fileNameDateFormat = DateFormat("yyyy_MM_ddTHH_mm_ss");
final GlobalKey<FormBuilderState> _formKey = GlobalKey();
PaperlessValidationErrors _errors = {};
bool _isUploadLoading = false;
late bool _syncTitleAndFilename;
final _now = DateTime.now();
@override
void initState() {
super.initState();
initializeDateFormatting(); //TODO: INTL (has to do with intl below)
_syncTitleAndFilename = widget.filename == null && widget.title == null;
initializeDateFormatting();
}
@override
@@ -83,7 +91,8 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
FormBuilderTextField(
autovalidateMode: AutovalidateMode.always,
name: DocumentModel.titleKey,
initialValue: "scan_${fileNameDateFormat.format(DateTime.now())}",
initialValue:
widget.title ?? "scan_${fileNameDateFormat.format(_now)}",
validator: FormBuilderValidators.required(),
decoration: InputDecoration(
labelText: S.of(context).documentTitlePropertyLabel,
@@ -92,29 +101,58 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
onPressed: () {
_formKey.currentState?.fields[DocumentModel.titleKey]
?.didChange("");
_formKey.currentState?.fields[fkFileName]
?.didChange(".pdf");
if (_syncTitleAndFilename) {
_formKey.currentState?.fields[fkFileName]?.didChange("");
}
},
),
errorText: _errors[DocumentModel.titleKey],
),
onChanged: (value) {
final String? transformedValue =
value?.replaceAll(RegExp(r"[\W_]"), "_");
_formKey.currentState?.fields[fkFileName]
?.didChange("${transformedValue ?? ''}.pdf");
final String transformedValue = _formatFilename(value ?? '');
if (_syncTitleAndFilename) {
_formKey.currentState?.fields[fkFileName]
?.didChange(transformedValue);
}
},
),
FormBuilderTextField(
autovalidateMode: AutovalidateMode.always,
readOnly: true,
enabled: false,
readOnly: _syncTitleAndFilename,
enabled: !_syncTitleAndFilename,
name: fkFileName,
decoration: InputDecoration(
labelText: S.of(context).documentUploadFileNameLabel,
suffixText: ".pdf",
suffixIcon: IconButton(
icon: const Icon(Icons.clear),
onPressed: () =>
_formKey.currentState?.fields[fkFileName]?.didChange(''),
),
),
initialValue:
"scan_${fileNameDateFormat.format(DateTime.now())}.pdf",
widget.filename ?? "scan_${fileNameDateFormat.format(_now)}",
),
SwitchListTile(
value: _syncTitleAndFilename,
onChanged: (value) {
setState(
() => _syncTitleAndFilename = value,
);
if (_syncTitleAndFilename) {
final String transformedValue = _formatFilename(_formKey
.currentState
?.fields[DocumentModel.titleKey]
?.value as String);
if (_syncTitleAndFilename) {
_formKey.currentState?.fields[fkFileName]
?.didChange(transformedValue);
}
}
},
title: Text(S
.of(context)
.documentUploadPageSynchronizeTitleAndFilenameLabel), //TODO: INTL
),
FormBuilderDateTimePicker(
autovalidateMode: AutovalidateMode.always,
@@ -202,7 +240,7 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
fv[DocumentModel.correspondentKey] as IdQueryParameter;
await BlocProvider.of<DocumentsCubit>(context).addDocument(
widget.fileBytes,
_formKey.currentState?.value[fkFileName],
_padWithPdfExtension(_formKey.currentState?.value[fkFileName]),
onConsumptionFinished: _onConsumptionFinished,
title: title,
documentType: docType.id,
@@ -215,11 +253,11 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
Navigator.pop(context);
widget.afterUpload?.call();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
} on PaperlessValidationErrors catch (errorMessages) {
setState(() => _errors = errorMessages);
} catch (unknownError, stackTrace) {
showError(context, ErrorMessage.unknown(), stackTrace);
showErrorMessage(context, ErrorMessage.unknown(), stackTrace);
} finally {
setState(() {
_isUploadLoading = false;
@@ -228,6 +266,14 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
}
}
String _padWithPdfExtension(String source) {
return source.endsWith(".pdf") ? source : '$source.pdf';
}
String _formatFilename(String source) {
return source.replaceAll(RegExp(r"[\W_]"), "_");
}
void _onConsumptionFinished(document) {
ScaffoldMessenger.of(rootScaffoldKey.currentContext!).showSnackBar(
SnackBar(
@@ -236,7 +282,7 @@ class _DocumentUploadPageState extends State<DocumentUploadPage> {
try {
getIt<DocumentsCubit>().reloadDocuments();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
},
label:

View File

@@ -192,7 +192,7 @@ class _ScannerPageState extends State<ScannerPage>
BlocProvider.of<DocumentScannerCubit>(context)
.removeScan(index);
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
},
index: index,
@@ -205,7 +205,7 @@ class _ScannerPageState extends State<ScannerPage>
try {
BlocProvider.of<DocumentScannerCubit>(context).reset();
} on ErrorMessage catch (error, stackTrace) {
showError(context, error, stackTrace);
showErrorMessage(context, error, stackTrace);
}
}
@@ -224,10 +224,16 @@ class _ScannerPageState extends State<ScannerPage>
);
if (result?.files.single.path != null) {
File file = File(result!.files.single.path!);
if (!supportedFileExtensions.contains(file.path.split('.').last)) {
//TODO: Show error message;
if (!supportedFileExtensions.contains(
file.path.split('.').last.toLowerCase(),
)) {
showErrorMessage(
context,
const ErrorMessage(ErrorCode.unsupportedFileFormat),
);
return;
}
final filename = extractFilenameFromPath(file.path);
final mimeType = lookupMimeType(file.path) ?? '';
late Uint8List fileBytes;
if (mimeType.startsWith('image')) {
@@ -244,6 +250,7 @@ class _ScannerPageState extends State<ScannerPage>
value: getIt<DocumentsCubit>(),
child: LabelBlocProvider(
child: DocumentUploadPage(
filename: filename,
fileBytes: fileBytes,
),
),

View File

@@ -1,9 +1,9 @@
{
"@@locale": "de",
"documentTitlePropertyLabel": "Titel",
"documentCreatedPropertyLabel": "Erstellt Am",
"documentAddedPropertyLabel": "Hinzugefügt Am",
"documentModifiedPropertyLabel": "Geändert Am",
"documentCreatedPropertyLabel": "Ausgestellt am",
"documentAddedPropertyLabel": "Hinzugefügt am",
"documentModifiedPropertyLabel": "Geändert am",
"documentDocumentTypePropertyLabel": "Dokumenttyp",
"documentCorrespondentPropertyLabel": "Korrespondent",
"documentStoragePathPropertyLabel": "Speicherpfad",
@@ -107,7 +107,7 @@
"documentScannerPageUploadFromThisDeviceButtonLabel": "Lade ein Dokument von diesem Gerät hoch",
"addTagPageTitle": "Neuer Tag",
"addCorrespondentPageTitle": "Neuer Korrespondent",
"addDocumentTypePageTitle": "Neuer Dokumententyp",
"addDocumentTypePageTitle": "Neuer Dokumenttyp",
"labelNamePropertyLabel": "Name",
"labelMatchPropertyLabel": "Zuweisungsmuster",
"labelMatchingAlgorithmPropertyLabel": "Zuweisungsalgorithmus",
@@ -195,5 +195,6 @@
"appDrawerHeaderLoggedInAsText": "Eingeloggt als ",
"labelAnyAssignedText": "Beliebig zugewiesen",
"deleteViewDialogContentText": "Möchtest Du diese Ansicht wirklich löschen?",
"deleteViewDialogTitleText": "Lösche Ansicht "
"deleteViewDialogTitleText": "Lösche Ansicht ",
"documentUploadPageSynchronizeTitleAndFilenameLabel": "Synchronisiere Titel und Dateiname"
}

View File

@@ -196,5 +196,6 @@
"appDrawerHeaderLoggedInAsText": "Logged in as ",
"labelAnyAssignedText": "Any assigned",
"deleteViewDialogContentText": "Do you really want to delete this view?",
"deleteViewDialogTitleText": "Delete view "
"deleteViewDialogTitleText": "Delete view ",
"documentUploadPageSynchronizeTitleAndFilenameLabel": "Synchronize title and filename"
}

View File

@@ -5,6 +5,7 @@ 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:fluttertoast/fluttertoast.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:intl/intl.dart';
import 'package:intl/intl_standalone.dart';
@@ -15,6 +16,7 @@ import 'package:paperless_mobile/core/bloc/paperless_server_information_cubit.da
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/di_initializer.dart';
@@ -132,21 +134,40 @@ class AuthenticationWrapper extends StatefulWidget {
class _AuthenticationWrapperState extends State<AuthenticationWrapper> {
bool isFileTypeSupported(SharedMediaFile file) {
return supportedFileExtensions.contains(file.path.split('.').last);
return supportedFileExtensions.contains(
file.path.split('.').last.toLowerCase(),
);
}
void handleReceivedFiles(List<SharedMediaFile> 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(),
late final SharedMediaFile file;
if (Platform.isIOS) {
// Workaround: https://stackoverflow.com/a/72813212
file = SharedMediaFile(
files.first.path.replaceAll('file://', ''),
files.first.thumbnail,
files.first.duration,
files.first.type,
);
} else {
file = files.first;
}
final bytes = File(files.first.path).readAsBytesSync();
if (!isFileTypeSupported(file)) {
Fluttertoast.showToast(
msg: translateError(context, ErrorCode.unsupportedFileFormat),
);
if (Platform.isAndroid) {
// As stated in the docs, SystemNavigator.pop() is ignored on IOS to comply with HCI guidelines.
await SystemNavigator.pop();
}
return;
}
final filename = extractFilenameFromPath(file.path);
final bytes = File(file.path).readAsBytesSync();
Navigator.push(
context,
MaterialPageRoute(
@@ -156,6 +177,7 @@ class _AuthenticationWrapperState extends State<AuthenticationWrapper> {
child: DocumentUploadPage(
fileBytes: bytes,
afterUpload: () => SystemNavigator.pop(),
filename: filename,
),
),
),
@@ -184,7 +206,7 @@ class _AuthenticationWrapperState extends State<AuthenticationWrapper> {
@override
Widget build(BuildContext context) {
return SafeArea(
top: true,
top: false,
left: false,
right: false,
bottom: false,

View File

@@ -34,7 +34,32 @@ void showSnackBar(
);
}
void showError(
void showGenericError(
BuildContext context,
dynamic error, [
StackTrace? stackTrace,
]) {
showSnackBar(
context,
error.toString(),
action: SnackBarAction(
label: S.of(context).errorReportLabel,
textColor: Colors.amber,
onPressed: () => GithubIssueService.createIssueFromError(
context,
stackTrace: stackTrace,
),
),
);
log(
"An error has occurred.",
error: error,
stackTrace: stackTrace,
time: DateTime.now(),
);
}
void showErrorMessage(
BuildContext context,
ErrorMessage error, [
StackTrace? stackTrace,
@@ -91,3 +116,7 @@ String formatLocalDate(BuildContext context, DateTime dateTime) {
final tag = Localizations.maybeLocaleOf(context)?.toLanguageTag();
return DateFormat.yMMMd(tag).format(dateTime);
}
String extractFilenameFromPath(String path) {
return path.split(RegExp('[./]')).reversed.skip(1).first;
}