Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Recover local gallery setup after a photo permission denial

r4khul698221735b0b
diff --git a/mobile/apps/photos/changes/local-gallery-permission-recovery.md b/mobile/apps/photos/changes/local-gallery-permission-recovery.md
new file mode 100644
index 0000000000..336431a5dc
--- /dev/null
+++ b/mobile/apps/photos/changes/local-gallery-permission-recovery.md
@@ -0,0 +1 @@
+- Local gallery setup now reliably keeps photo access granted from the system prompt or settings, and tapping Continue again after a denial opens settings.
diff --git a/mobile/apps/photos/lib/services/permission/service.dart b/mobile/apps/photos/lib/services/permission/service.dart
index c05cc3acb5..2936c58422 100644
--- a/mobile/apps/photos/lib/services/permission/service.dart
+++ b/mobile/apps/photos/lib/services/permission/service.dart
@@ -4,6 +4,7 @@ import "package:shared_preferences/shared_preferences.dart";
class PermissionService {
static const kHasGrantedPermissionsKey = "has_granted_permissions";
static const kPermissionStateKey = "permission_state";
+ static const kHasAttemptedPermissionKey = "has_attempted_permission";
static const _photoLibraryAddRequestOption = PermissionRequestOption(
iosAccessLevel: IosAccessLevel.addOnly,
);
@@ -36,6 +37,14 @@ class PermissionService {
return _prefs.getBool(kHasGrantedPermissionsKey) ?? false;
}
+ bool hasAttemptedPermission() {
+ return _prefs.getBool(kHasAttemptedPermissionKey) ?? false;
+ }
+
+ Future<void> setHasAttemptedPermission() async {
+ await _prefs.setBool(kHasAttemptedPermissionKey, true);
+ }
+
bool hasGrantedLimitedPermissions() {
return _prefs.getString(kPermissionStateKey) ==
PermissionState.limited.toString();
diff --git a/mobile/apps/photos/lib/settings/local_settings.dart b/mobile/apps/photos/lib/settings/local_settings.dart
index ce56ac9848..5ff4e23814 100644
--- a/mobile/apps/photos/lib/settings/local_settings.dart
+++ b/mobile/apps/photos/lib/settings/local_settings.dart
@@ -129,6 +129,8 @@ class LocalSettings {
static const _kRustMlDbOverride = "ls.rust_ml_db_override";
static const _kAppMode = "ls.app_mode";
static const _kShowLocalGalleryModeOption = "ls.show_offline_mode_option";
+ static const _kLocalGalleryOnboardingPending =
+ "ls.local_gallery_onboarding_pending";
static const _kDeletePreference = "delete_preference";
static const _kMediaManagementHintDeleteAttempts =
"media_management_hint_delete_attempts";
@@ -805,6 +807,13 @@ class LocalSettings {
await _prefs.setBool(_kShowLocalGalleryModeOption, value);
}
+ bool get isLocalGalleryOnboardingPending =>
+ _prefs.getBool(_kLocalGalleryOnboardingPending) ?? false;
+
+ Future<void> setLocalGalleryOnboardingPending(bool value) async {
+ await _prefs.setBool(_kLocalGalleryOnboardingPending, value);
+ }
+
bool get isLocalGalleryGetStartedBannerDismissed {
final dismissedAtMs =
_prefs.getInt(_kLocalGalleryGetStartedBannerDismissedAt) ?? 0;
diff --git a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart
index 6ec792e6ef..9f6008f2bd 100644
--- a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart
+++ b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart
@@ -1,4 +1,5 @@
import "dart:async";
+import "dart:io";
import "dart:math";
import "package:ente_components/ente_components.dart";
@@ -35,8 +36,10 @@ class GrantPermissionsWidget extends StatefulWidget {
State<GrantPermissionsWidget> createState() => _GrantPermissionsWidgetState();
}
-class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget> {
+class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>
+ with WidgetsBindingObserver {
final Logger _logger = Logger("_GrantPermissionsWidgetState");
+ bool _isEnteringLocalGallery = false;
final Debouncer _onlyNewActionDebouncer = Debouncer(
const Duration(milliseconds: 500),
leading: true,
@@ -50,15 +53,25 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget> {
"assets/home_tab.riv",
riveFactory: rive.Factory.flutter,
);
+ WidgetsBinding.instance.addObserver(this);
+ unawaited(_enterLocalGalleryIfPermitted());
}
@override
void dispose() {
+ WidgetsBinding.instance.removeObserver(this);
_permissionsAnimationLoader.dispose();
_onlyNewActionDebouncer.cancelDebounceTimer();
super.dispose();
}
+ @override
+ void didChangeAppLifecycleState(AppLifecycleState state) {
+ if (state == AppLifecycleState.resumed) {
+ unawaited(_enterLocalGalleryIfPermitted());
+ }
+ }
+
@override
Widget build(BuildContext context) {
if (widget.startWithoutAccount) {
@@ -203,32 +216,62 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget> {
Future<void> _onTapOfflineGrantPermission() async {
try {
+ final wasDecidedBefore =
+ Platform.isIOS &&
+ await permissionService.getPermissionState() !=
+ PermissionState.notDetermined;
final state = await permissionService.requestPhotoMangerPermissions();
_logger.info("Offline permission state: $state");
- if (state == PermissionState.authorized ||
- state == PermissionState.limited) {
- await localSettings.setAppMode(AppMode.localGallery);
- localSettings.localGalleryModeEnabledThisSession = true;
- Bus.instance.fire(AppModeChangedEvent());
- await permissionService.onUpdatePermission(state);
- SyncService.instance.onPermissionGranted().ignore();
- Bus.instance.fire(PermissionGrantedEvent());
- try {
- await setMLConsent(true);
- await MLService.instance.init();
- await SemanticSearchService.instance.init();
- unawaited(MLService.instance.runAllML(force: true));
- } catch (e) {
- _logger.severe("Failed to initialize ML after permission grant", e);
- }
+ if (state.hasAccess) {
+ await _enterLocalGallery(state);
+ } else if (wasDecidedBefore ||
+ permissionService.hasAttemptedPermission()) {
+ await localSettings.setLocalGalleryOnboardingPending(true);
+ await PhotoManager.openSetting();
} else {
- await _showPermissionDeniedDialog();
+ await permissionService.setHasAttemptedPermission();
}
} catch (e) {
_logger.severe("Failed to request permission: ${e.toString()}", e);
}
}
+ Future<void> _enterLocalGalleryIfPermitted() async {
+ if (!widget.startWithoutAccount) {
+ return;
+ }
+ try {
+ final state = await permissionService.getPermissionState();
+ if (state.hasAccess) {
+ await _enterLocalGallery(state);
+ }
+ } catch (e) {
+ _logger.severe("Failed to check permission: ${e.toString()}", e);
+ }
+ }
+
+ Future<void> _enterLocalGallery(PermissionState state) async {
+ if (_isEnteringLocalGallery) {
+ return;
+ }
+ _isEnteringLocalGallery = true;
+ await localSettings.setAppMode(AppMode.localGallery);
+ localSettings.localGalleryModeEnabledThisSession = true;
+ await setMLConsent(true);
+ Bus.instance.fire(AppModeChangedEvent());
+ await permissionService.onUpdatePermission(state);
+ await localSettings.setLocalGalleryOnboardingPending(false);
+ SyncService.instance.onPermissionGranted().ignore();
+ Bus.instance.fire(PermissionGrantedEvent());
+ try {
+ await MLService.instance.init();
+ await SemanticSearchService.instance.init();
+ unawaited(MLService.instance.runAllML(force: true));
+ } catch (e) {
+ _logger.severe("Failed to initialize ML after permission grant", e);
+ }
+ }
+
Future<void> _onTapSkip() async {
await backupPreferenceService.setOnboardingPermissionSkipped(true);
SyncService.instance.sync().ignore();
@@ -239,16 +282,10 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget> {
}
Future<void> _showPermissionDeniedDialog() async {
- final title = widget.startWithoutAccount
- ? context.strings.grantPermission
- : context.strings.allowPermTitle;
- final message = widget.startWithoutAccount
- ? context.strings.grantPermissionDesc
- : context.strings.allowPermBody;
await showAlertBottomSheet(
context,
- title: title,
- message: message,
+ title: context.strings.allowPermTitle,
+ message: context.strings.allowPermBody,
assetPath: 'assets/ducky_smart_feature.png',
buttons: [
ButtonWidgetV2(
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index a3c551bffb..5bf46e5641 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -118,7 +118,7 @@ class _HomeWidgetState extends State<HomeWidget> {
bool _personSyncTriggered = false;
bool _collectionsSyncTriggered = false;
bool _isShowingChangeLog = false;
- bool _startWithoutAccount = false;
+ bool _startWithoutAccount = localSettings.isLocalGalleryOnboardingPending;
final isOnSearchTabNotifier = ValueNotifier<bool>(false);
final ValueNotifier<bool> _isAlbumsSearchActiveNotifier = ValueNotifier<bool>(
false,
@@ -233,6 +233,7 @@ class _HomeWidgetState extends State<HomeWidget> {
event,
) {
_startWithoutAccount = false;
+ unawaited(localSettings.setLocalGalleryOnboardingPending(false));
setState(() {});
_handleMissingRecoveryKey();
if (!isLocalGalleryMode) {
@@ -859,6 +860,7 @@ class _HomeWidgetState extends State<HomeWidget> {
!Configuration.instance.hasConfiguredAccount() &&
!localSettings.isAppModeSet;
if (isStartWithoutAccountFlow) {
+ unawaited(localSettings.setLocalGalleryOnboardingPending(false));
setState(() {
_startWithoutAccount = false;
});