Changed saved views handling, changed repository structure with automatic persistence.

lib/features/home/view/home_page.dart

@@ -1,4 +1,3 @@
-import 'dart:developer';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -12,6 +11,10 @@ import 'package:paperless_mobile/core/global/constants.dart';
 import 'package:paperless_mobile/core/logic/error_code_localization_mapper.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/repository/saved_view_repository.dart';
+import 'package:paperless_mobile/core/repository/state/impl/correspondent_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/document_type_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/storage_path_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/tag_repository_state.dart';
 import 'package:paperless_mobile/features/document_upload/cubit/document_upload_cubit.dart';
 import 'package:paperless_mobile/features/document_upload/view/document_upload_preparation_page.dart';
 import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
@@ -25,9 +28,8 @@ import 'package:paperless_mobile/features/scan/view/scanner_page.dart';
 import 'package:paperless_mobile/features/sharing/share_intent_queue.dart';
 import 'package:paperless_mobile/generated/l10n.dart';
 import 'package:paperless_mobile/util.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:provider/provider.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+import 'package:path/path.dart' as p;
 
 class HomePage extends StatefulWidget {
   const HomePage({Key? key}) : super(key: key);
@@ -51,17 +53,13 @@ class _HomePageState extends State<HomePage> {
 
   void _listenForReceivedFiles() async {
     if (ShareIntentQueue.instance.hasUnhandledFiles) {
-      Fluttertoast.showToast(msg: "Sync: Has unhandled files!");
       await _handleReceivedFile(ShareIntentQueue.instance.pop()!);
-      Fluttertoast.showToast(msg: "Sync: File handled!");
     }
     ShareIntentQueue.instance.addListener(() async {
       final queue = ShareIntentQueue.instance;
       while (queue.hasUnhandledFiles) {
-        Fluttertoast.showToast(msg: "Async: Has unhandled files!");
         final file = queue.pop()!;
         await _handleReceivedFile(file);
-        Fluttertoast.showToast(msg: "Async: File handled!");
       }
     });
   }
@@ -73,28 +71,29 @@ class _HomePageState extends State<HomePage> {
   }
 
   Future<void> _handleReceivedFile(SharedMediaFile file) async {
-    final isGranted = await askForPermission(Permission.storage);
+    // final isGranted = await askForPermission(Permission.storage);
 
-    if (!isGranted) {
-      return;
-    }
-    showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-              title: Text("Received File."),
-              content: Column(
-                children: [
-                  Text("Path: ${file.path}"),
-                  Text("Type: ${file.type.name}"),
-                  Text("Exists: ${File(file.path).existsSync()}"),
-                  FutureBuilder<bool>(
-                    future: Permission.storage.isGranted,
-                    builder: (context, snapshot) =>
-                        Text("Has storage permission: ${snapshot.data}"),
-                  )
-                ],
-              ),
-            ));
+    // if (!isGranted) {
+    //   return;
+    // }
+    // showDialog(
+    //   context: context,
+    //   builder: (context) => AlertDialog(
+    //     title: Text("Received File."),
+    //     content: Column(
+    //       children: [
+    //         Text("Path: ${file.path}"),
+    //         Text("Type: ${file.type.name}"),
+    //         Text("Exists: ${File(file.path).existsSync()}"),
+    //         FutureBuilder<bool>(
+    //           future: Permission.storage.isGranted,
+    //           builder: (context, snapshot) =>
+    //               Text("Has storage permission: ${snapshot.data}"),
+    //         )
+    //       ],
+    //     ),
+    //   ),
+    // );
     SharedMediaFile mediaFile;
     if (Platform.isIOS) {
       // Workaround for file not found on iOS: https://stackoverflow.com/a/72813212
@@ -119,7 +118,7 @@ class _HomePageState extends State<HomePage> {
       return;
     }
     final filename = extractFilenameFromPath(mediaFile.path);
-
+    final extension = p.extension(mediaFile.path);
     try {
       if (File(mediaFile.path).existsSync()) {
         final bytes = File(mediaFile.path).readAsBytesSync();
@@ -137,6 +136,8 @@ class _HomePageState extends State<HomePage> {
                   child: DocumentUploadPreparationPage(
                     fileBytes: bytes,
                     filename: filename,
+                    title: filename,
+                    fileExtension: extension,
                   ),
                 ),
               ),
@@ -148,20 +149,16 @@ class _HomePageState extends State<HomePage> {
           );
           SystemNavigator.pop();
         }
+      } else {
+        Fluttertoast.showToast(
+          msg: S.of(context).receiveSharedFilePermissionDeniedMessage,
+          toastLength: Toast.LENGTH_LONG,
+        );
       }
     } catch (e, stackTrace) {
-      showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-          content: Column(
-            children: [
-              Text(
-                e.toString(),
-              ),
-              Text(stackTrace.toString()),
-            ],
-          ),
-        ),
+      Fluttertoast.showToast(
+        msg: S.of(context).receiveSharedFilePermissionDeniedMessage,
+        toastLength: Toast.LENGTH_LONG,
       );
     }
   }
@@ -191,6 +188,7 @@ class _HomePageState extends State<HomePage> {
               BlocProvider(
                 create: (context) => DocumentsCubit(
                   context.read<PaperlessDocumentsApi>(),
+                  context.read<SavedViewRepository>(),
                 ),
               ),
               BlocProvider(
@@ -213,10 +211,16 @@ class _HomePageState extends State<HomePage> {
 
   void _initializeData(BuildContext context) {
     try {
-      context.read<LabelRepository<Tag>>().findAll();
-      context.read<LabelRepository<Correspondent>>().findAll();
-      context.read<LabelRepository<DocumentType>>().findAll();
-      context.read<LabelRepository<StoragePath>>().findAll();
+      context.read<LabelRepository<Tag, TagRepositoryState>>().findAll();
+      context
+          .read<LabelRepository<Correspondent, CorrespondentRepositoryState>>()
+          .findAll();
+      context
+          .read<LabelRepository<DocumentType, DocumentTypeRepositoryState>>()
+          .findAll();
+      context
+          .read<LabelRepository<StoragePath, StoragePathRepositoryState>>()
+          .findAll();
       context.read<SavedViewRepository>().findAll();
       context.read<PaperlessServerInformationCubit>().updateInformtion();
     } on PaperlessServerException catch (error, stackTrace) {

lib/features/home/view/widget/info_drawer.dart

@@ -7,6 +7,10 @@ import 'package:paperless_mobile/core/bloc/paperless_server_information_state.da
 import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/repository/provider/label_repositories_provider.dart';
 import 'package:paperless_mobile/core/repository/saved_view_repository.dart';
+import 'package:paperless_mobile/core/repository/state/impl/correspondent_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/document_type_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/storage_path_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/tag_repository_state.dart';
 import 'package:paperless_mobile/core/store/local_vault.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/inbox/bloc/inbox_cubit.dart';
@@ -102,154 +106,161 @@ class _InfoDrawerState extends State<InfoDrawer> {
     //     }
     //   },
     // );
-    return ClipRRect(
-      borderRadius: const BorderRadius.only(
-        topRight: Radius.circular(16.0),
-        bottomRight: Radius.circular(16.0),
-      ),
-      child: Drawer(
-        shape: const RoundedRectangleBorder(
-          borderRadius: const BorderRadius.only(
-            topRight: Radius.circular(16.0),
-            bottomRight: Radius.circular(16.0),
-          ),
+    return SafeArea(
+      top: true,
+      child: ClipRRect(
+        borderRadius: const BorderRadius.only(
+          topRight: Radius.circular(16.0),
+          bottomRight: Radius.circular(16.0),
         ),
-        child: ListView(
-          children: [
-            DrawerHeader(
-              padding: const EdgeInsets.only(
-                top: 8,
-                left: 8,
-                bottom: 0,
-                right: 8,
-              ),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Image.asset(
-                        'assets/logos/paperless_logo_white.png',
-                        height: 32,
-                        width: 32,
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
-                      ).paddedOnly(right: 8.0),
-                      Text(
-                        S.of(context).appTitleText,
-                        style:
-                            Theme.of(context).textTheme.headlineSmall?.copyWith(
-                                  color: Theme.of(context)
-                                      .colorScheme
-                                      .onPrimaryContainer,
-                                ),
-                      ),
-                    ],
-                  ),
-                  Align(
-                    alignment: Alignment.bottomRight,
-                    child: BlocBuilder<PaperlessServerInformationCubit,
-                        PaperlessServerInformationState>(
-                      builder: (context, state) {
-                        if (!state.isLoaded) {
-                          return Container();
-                        }
-                        final info = state.information!;
-                        return Column(
-                          crossAxisAlignment: CrossAxisAlignment.end,
-                          children: [
-                            ListTile(
-                              contentPadding: EdgeInsets.zero,
-                              dense: true,
-                              title: Text(
-                                S.of(context).appDrawerHeaderLoggedInAsText +
-                                    (info.username ?? '?'),
-                                style: Theme.of(context).textTheme.bodyMedium,
-                                overflow: TextOverflow.ellipsis,
-                                textAlign: TextAlign.end,
-                                maxLines: 1,
-                              ),
-                              subtitle: Column(
-                                crossAxisAlignment: CrossAxisAlignment.end,
-                                children: [
-                                  Text(
-                                    state.information!.host ?? '',
-                                    style:
-                                        Theme.of(context).textTheme.bodyMedium,
-                                    overflow: TextOverflow.ellipsis,
-                                    textAlign: TextAlign.end,
-                                    maxLines: 1,
-                                  ),
-                                  Text(
-                                    '${S.of(context).serverInformationPaperlessVersionText} ${info.version} (API v${info.apiVersion})',
-                                    style:
-                                        Theme.of(context).textTheme.bodySmall,
-                                    overflow: TextOverflow.ellipsis,
-                                    textAlign: TextAlign.end,
-                                    maxLines: 1,
-                                  ),
-                                ],
-                              ),
-                              isThreeLine: true,
-                            ),
-                          ],
-                        );
-                      },
-                    ),
-                  ),
-                ],
-              ),
-              decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.primaryContainer,
-              ),
+        child: Drawer(
+          shape: const RoundedRectangleBorder(
+            borderRadius: const BorderRadius.only(
+              topRight: Radius.circular(16.0),
+              bottomRight: Radius.circular(16.0),
             ),
-            ...[
-              ListTile(
-                title: Text(S.of(context).bottomNavInboxPageLabel),
-                leading: const Icon(Icons.inbox),
-                onTap: () => _onOpenInbox(),
-                shape: listtTileShape,
-              ),
-              ListTile(
-                leading: const Icon(Icons.settings),
-                shape: listtTileShape,
-                title: Text(
-                  S.of(context).appDrawerSettingsLabel,
+          ),
+          child: ListView(
+            children: [
+              DrawerHeader(
+                padding: const EdgeInsets.only(
+                  top: 8,
+                  left: 8,
+                  bottom: 0,
+                  right: 8,
                 ),
-                onTap: () => Navigator.of(context).push(
-                  MaterialPageRoute(
-                    builder: (context) => BlocProvider.value(
-                      value: context.read<ApplicationSettingsCubit>(),
-                      child: const SettingsPage(),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Image.asset(
+                          'assets/logos/paperless_logo_white.png',
+                          height: 32,
+                          width: 32,
+                          color:
+                              Theme.of(context).colorScheme.onPrimaryContainer,
+                        ).paddedOnly(right: 8.0),
+                        Text(
+                          S.of(context).appTitleText,
+                          style: Theme.of(context)
+                              .textTheme
+                              .headlineSmall
+                              ?.copyWith(
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onPrimaryContainer,
+                              ),
+                        ),
+                      ],
+                    ),
+                    Align(
+                      alignment: Alignment.bottomRight,
+                      child: BlocBuilder<PaperlessServerInformationCubit,
+                          PaperlessServerInformationState>(
+                        builder: (context, state) {
+                          if (!state.isLoaded) {
+                            return Container();
+                          }
+                          final info = state.information!;
+                          return Column(
+                            crossAxisAlignment: CrossAxisAlignment.end,
+                            children: [
+                              ListTile(
+                                contentPadding: EdgeInsets.zero,
+                                dense: true,
+                                title: Text(
+                                  S.of(context).appDrawerHeaderLoggedInAsText +
+                                      (info.username ?? '?'),
+                                  style: Theme.of(context).textTheme.bodyMedium,
+                                  overflow: TextOverflow.ellipsis,
+                                  textAlign: TextAlign.end,
+                                  maxLines: 1,
+                                ),
+                                subtitle: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.end,
+                                  children: [
+                                    Text(
+                                      state.information!.host ?? '',
+                                      style: Theme.of(context)
+                                          .textTheme
+                                          .bodyMedium,
+                                      overflow: TextOverflow.ellipsis,
+                                      textAlign: TextAlign.end,
+                                      maxLines: 1,
+                                    ),
+                                    Text(
+                                      '${S.of(context).serverInformationPaperlessVersionText} ${info.version} (API v${info.apiVersion})',
+                                      style:
+                                          Theme.of(context).textTheme.bodySmall,
+                                      overflow: TextOverflow.ellipsis,
+                                      textAlign: TextAlign.end,
+                                      maxLines: 1,
+                                    ),
+                                  ],
+                                ),
+                                isThreeLine: true,
+                              ),
+                            ],
+                          );
+                        },
+                      ),
+                    ),
+                  ],
+                ),
+                decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.primaryContainer,
+                ),
+              ),
+              ...[
+                ListTile(
+                  title: Text(S.of(context).bottomNavInboxPageLabel),
+                  leading: const Icon(Icons.inbox),
+                  onTap: () => _onOpenInbox(),
+                  shape: listtTileShape,
+                ),
+                ListTile(
+                  leading: const Icon(Icons.settings),
+                  shape: listtTileShape,
+                  title: Text(
+                    S.of(context).appDrawerSettingsLabel,
+                  ),
+                  onTap: () => Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => BlocProvider.value(
+                        value: context.read<ApplicationSettingsCubit>(),
+                        child: const SettingsPage(),
+                      ),
                     ),
                   ),
                 ),
-              ),
-              ListTile(
-                leading: const Icon(Icons.bug_report),
-                title: Text(S.of(context).appDrawerReportBugLabel),
-                onTap: () {
-                  launchUrlString(
-                      'https://github.com/astubenbord/paperless-mobile/issues/new');
-                },
-                shape: listtTileShape,
-              ),
-              ListTile(
-                title: Text(S.of(context).appDrawerAboutLabel),
-                leading: Icon(Icons.info_outline_rounded),
-                onTap: _onShowAboutDialog,
-                shape: listtTileShape,
-              ),
-              ListTile(
-                leading: const Icon(Icons.logout),
-                title: Text(S.of(context).appDrawerLogoutLabel),
-                shape: listtTileShape,
-                onTap: () {
-                  _onLogout();
-                },
-              )
+                ListTile(
+                  leading: const Icon(Icons.bug_report),
+                  title: Text(S.of(context).appDrawerReportBugLabel),
+                  onTap: () {
+                    launchUrlString(
+                        'https://github.com/astubenbord/paperless-mobile/issues/new');
+                  },
+                  shape: listtTileShape,
+                ),
+                ListTile(
+                  title: Text(S.of(context).appDrawerAboutLabel),
+                  leading: Icon(Icons.info_outline_rounded),
+                  onTap: _onShowAboutDialog,
+                  shape: listtTileShape,
+                ),
+                ListTile(
+                  leading: const Icon(Icons.logout),
+                  title: Text(S.of(context).appDrawerLogoutLabel),
+                  shape: listtTileShape,
+                  onTap: () {
+                    _onLogout();
+                  },
+                )
+              ],
             ],
-          ],
+          ),
         ),
       ),
     );
@@ -260,10 +271,16 @@ class _InfoDrawerState extends State<InfoDrawer> {
       context.read<AuthenticationCubit>().logout();
       context.read<LocalVault>().clear();
       context.read<ApplicationSettingsCubit>().clear();
-      context.read<LabelRepository<Tag>>().clear();
-      context.read<LabelRepository<Correspondent>>().clear();
-      context.read<LabelRepository<DocumentType>>().clear();
-      context.read<LabelRepository<StoragePath>>().clear();
+      context.read<LabelRepository<Tag, TagRepositoryState>>().clear();
+      context
+          .read<LabelRepository<Correspondent, CorrespondentRepositoryState>>()
+          .clear();
+      context
+          .read<LabelRepository<DocumentType, DocumentTypeRepositoryState>>()
+          .clear();
+      context
+          .read<LabelRepository<StoragePath, StoragePathRepositoryState>>()
+          .clear();
       context.read<SavedViewRepository>().clear();
     } on PaperlessServerException catch (error, stackTrace) {
       showErrorMessage(context, error, stackTrace);
@@ -276,7 +293,7 @@ class _InfoDrawerState extends State<InfoDrawer> {
         builder: (_) => LabelRepositoriesProvider(
           child: BlocProvider(
             create: (context) => InboxCubit(
-              context.read<LabelRepository<Tag>>(),
+              context.read<LabelRepository<Tag, TagRepositoryState>>(),
               context.read<PaperlessDocumentsApi>(),
             )..loadInbox(),
             child: const InboxPage(),

lib/features/home/view/widget/verify_identity_page.dart

@@ -3,6 +3,10 @@ import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/repository/saved_view_repository.dart';
+import 'package:paperless_mobile/core/repository/state/impl/correspondent_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/document_type_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/storage_path_repository_state.dart';
+import 'package:paperless_mobile/core/repository/state/impl/tag_repository_state.dart';
 import 'package:paperless_mobile/extensions/flutter_extensions.dart';
 import 'package:paperless_mobile/features/login/bloc/authentication_cubit.dart';
 import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
@@ -66,10 +70,16 @@ class VerifyIdentityPage extends StatelessWidget {
 
   void _logout(BuildContext context) {
     context.read<AuthenticationCubit>().logout();
-    context.read<LabelRepository<Tag>>().clear();
-    context.read<LabelRepository<Correspondent>>().clear();
-    context.read<LabelRepository<DocumentType>>().clear();
-    context.read<LabelRepository<StoragePath>>().clear();
+    context.read<LabelRepository<Tag, TagRepositoryState>>().clear();
+    context
+        .read<LabelRepository<Correspondent, CorrespondentRepositoryState>>()
+        .clear();
+    context
+        .read<LabelRepository<DocumentType, DocumentTypeRepositoryState>>()
+        .clear();
+    context
+        .read<LabelRepository<StoragePath, StoragePathRepositoryState>>()
+        .clear();
     context.read<SavedViewRepository>().clear();
     HydratedBloc.storage.clear();
   }