iOS: Handle limited or no permission (#1358)

ente-io · Aug 29, 2023 · 5200972 · 5200972
2 parents 7a2841c + 3379b4c
commit 5200972
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 8 deletions.
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -644,6 +644,9 @@
   "startBackup": "Start backup",
   "noPhotosAreBeingBackedUpRightNow": "No photos are being backed up right now",
   "preserveMore": "Preserve more",
+  "grantFullAccessPrompt": "Please allow access to all photos in the Settings app",
+  "openSettings": "Open Settings",
+  "selectMorePhotos": "Select more photos",
   "existingUser": "Existing user",
   "privateBackups": "Private backups",
   "forYourMemories": "for your memories",

diff --git a/lib/services/local_sync_service.dart b/lib/services/local_sync_service.dart
@@ -241,6 +241,16 @@ class LocalSyncService {
         PermissionState.limited.toString();
   }
 
+  bool hasGrantedFullPermission() {
+    return (_prefs.getString(kPermissionStateKey) ?? '') ==
+        PermissionState.authorized.toString();
+  }
+
+  Future<void> onUpdatePermission(PermissionState state) async {
+    await _prefs.setBool(kHasGrantedPermissionsKey, true);
+    await _prefs.setString(kPermissionStateKey, state.toString());
+  }
+
   Future<void> onPermissionGranted(PermissionState state) async {
     await _prefs.setBool(kHasGrantedPermissionsKey, true);
     await _prefs.setString(kPermissionStateKey, state.toString());

diff --git a/lib/ui/home/preserve_footer_widget.dart b/lib/ui/home/preserve_footer_widget.dart
@@ -1,11 +1,16 @@
 import 'dart:async';
+import "dart:io";
 
 import 'package:flutter/material.dart';
+import "package:flutter/services.dart";
+import "package:logging/logging.dart";
 import 'package:photo_manager/photo_manager.dart';
+import "package:photos/core/configuration.dart";
 import "package:photos/generated/l10n.dart";
 import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/ui/common/gradient_button.dart';
 import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
+import "package:photos/utils/dialog_util.dart";
 import 'package:photos/utils/navigation_util.dart';
 
 class PreserveFooterWidget extends StatelessWidget {
@@ -17,14 +22,46 @@ class PreserveFooterWidget extends StatelessWidget {
       padding: const EdgeInsets.fromLTRB(20, 24, 20, 100),
       child: GradientButton(
         onTap: () async {
-          if (LocalSyncService.instance.hasGrantedLimitedPermissions()) {
-            await PhotoManager.presentLimited();
+          try {
+            final PermissionState state =
+                await PhotoManager.requestPermissionExtend();
+            await LocalSyncService.instance.onUpdatePermission(state);
+          } on Exception catch (e) {
+            Logger("PreserveFooterWidget").severe(
+              "Failed to request permission: ${e.toString()}",
+              e,
+            );
+          }
+          if (!LocalSyncService.instance.hasGrantedFullPermission()) {
+            if (Platform.isAndroid) {
+              await PhotoManager.openSetting();
+            } else {
+              final bool hasGrantedLimit =
+                  LocalSyncService.instance.hasGrantedLimitedPermissions();
+              showChoiceActionSheet(
+                context,
+                title: S.of(context).preserveMore,
+                body: S.of(context).grantFullAccessPrompt,
+                firstButtonLabel: S.of(context).openSettings,
+                firstButtonOnTap: () async {
+                  await PhotoManager.openSetting();
+                },
+                secondButtonLabel: hasGrantedLimit
+                    ? S.of(context).selectMorePhotos
+                    : S.of(context).cancel,
+                secondButtonOnTap: () async {
+                  if (hasGrantedLimit) {
+                    await PhotoManager.presentLimited();
+                  }
+                },
+              );
+            }
           } else {
             unawaited(
               routeToPage(
                 context,
-                const BackupFolderSelectionPage(
-                  buttonText: "Preserve",
+                 BackupFolderSelectionPage(
+                  buttonText: S.of(context).backup,
                 ),
               ),
             );

diff --git a/lib/ui/settings/backup/backup_folder_selection_page.dart b/lib/ui/settings/backup/backup_folder_selection_page.dart
@@ -78,14 +78,14 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
               title: const Text(""),
             ),
       body: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.start,
         children: [
           const SizedBox(
             height: 0,
           ),
           SafeArea(
             child: Container(
-              padding: const EdgeInsets.fromLTRB(24, 32, 24, 8),
+              padding: const EdgeInsets.fromLTRB(24, 8, 24, 8),
               child: Text(
                 S.of(context).selectFoldersForBackup,
                 textAlign: TextAlign.left,

diff --git a/lib/ui/viewer/file/file_app_bar.dart b/lib/ui/viewer/file/file_app_bar.dart
@@ -150,7 +150,7 @@ class FileAppBarState extends State<FileAppBar> {
             );
           }
           // options for files owned by the user
-          if (isOwnedByUser && !isFileHidden) {
+          if (isOwnedByUser && !isFileHidden && isFileUploaded) {
             final bool isArchived =
                 widget.file.magicMetadata.visibility == archiveVisibility;
             items.add(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.7.84+484
+version: 0.7.87+487
 
 environment:
   sdk: ">=3.0.0 <4.0.0"