Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] clean up notification permission flow

Priyanshu Dangare14a5216f3d2e
diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dart
index a2bd69a427..96aba447b5 100644
--- a/mobile/apps/photos/lib/services/memories_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart
@@ -1433,25 +1433,23 @@ class MemoriesCacheService {
Future<void> setOnThisDayNotifications(bool value) async {
if (localSettings.isOnThisDayNotificationsEnabled == value) return;
-
await localSettings.setOnThisDayNotificationsEnabled(value);
_logger.info("Turning onThisDayNotifications ${value ? "on" : "off"}");
- if (!value) {
- await _clearAllScheduledOnThisDayNotifications();
- } else {
+ if (value) {
queueUpdateCache();
+ } else {
+ await _clearAllScheduledOnThisDayNotifications();
}
}
Future<void> setBirthdayNotifications(bool value) async {
if (localSettings.birthdayNotificationsEnabled == value) return;
-
await localSettings.setBirthdayNotificationsEnabled(value);
_logger.info("Turning birthdayNotifications ${value ? "on" : "off"}");
- if (!value) {
- await _clearAllScheduledBirthdayNotifications();
- } else {
+ if (value) {
queueUpdateCache();
+ } else {
+ await _clearAllScheduledBirthdayNotifications();
}
}
diff --git a/mobile/apps/photos/lib/services/notification_service.dart b/mobile/apps/photos/lib/services/notification_service.dart
index 6ca510df2a..4524b380f6 100644
--- a/mobile/apps/photos/lib/services/notification_service.dart
+++ b/mobile/apps/photos/lib/services/notification_service.dart
@@ -22,8 +22,6 @@ class NotificationService {
"notifications_enabled_shared_photos";
static const String keyShouldShowSocialNotifications =
"notifications_enabled_social";
- static const String _androidAppNotificationSettingsAction =
- "android.settings.APP_NOTIFICATION_SETTINGS";
NotificationService._privateConstructor();
@@ -166,90 +164,67 @@ class NotificationService {
}
Future<bool> requestPermissions(BuildContext context) async {
- if (await hasGrantedPermissions()) {
- return true;
- }
-
- if (await _askPermissions()) {
- return true;
- }
-
- if (!context.mounted) {
- return false;
- }
-
+ if (await hasGrantedPermissions()) return true;
+ if (!context.mounted) return false;
+ if (await _askPermissions()) return true;
+ if (!context.mounted) return false;
await _openNotificationSettings(context);
-
const interval = Duration(milliseconds: 500);
const maxAttempts = 1000;
-
for (var attempt = 0; attempt < maxAttempts; attempt++) {
await Future.delayed(interval);
-
- if (await hasGrantedPermissions()) {
- return true;
- }
+ if (await hasGrantedPermissions()) return true;
}
-
return false;
}
Future<bool> _askPermissions() async {
await _ensurePluginInitialized();
- final granted =
- (Platform.isIOS
- ? await _notificationsPlugin
- .resolvePlatformSpecificImplementation<
- IOSFlutterLocalNotificationsPlugin
- >()
- ?.requestPermissions(sound: true, alert: true)
- : await _notificationsPlugin
- .resolvePlatformSpecificImplementation<
- AndroidFlutterLocalNotificationsPlugin
- >()
- ?.requestNotificationsPermission()) ??
- false;
- return granted;
+ if (Platform.isIOS) {
+ final impl = _notificationsPlugin
+ .resolvePlatformSpecificImplementation<
+ IOSFlutterLocalNotificationsPlugin
+ >();
+ return await impl?.requestPermissions(sound: true, alert: true) ?? false;
+ }
+ final impl = _notificationsPlugin
+ .resolvePlatformSpecificImplementation<
+ AndroidFlutterLocalNotificationsPlugin
+ >();
+ return await impl?.requestNotificationsPermission() ?? false;
}
Future<void> _openNotificationSettings(BuildContext context) async {
- if (!Platform.isAndroid) {
+ if (Platform.isIOS) {
await openAppSettings();
return;
}
-
final packageInfo = await PackageInfo.fromPlatform();
await AndroidIntent(
- action: _androidAppNotificationSettingsAction,
+ action: "android.settings.APP_NOTIFICATION_SETTINGS",
arguments: {
"android.provider.extra.APP_PACKAGE": packageInfo.packageName,
},
).launch();
- if (context.mounted) {
- final l10n = AppLocalizations.of(context);
- showToast(context, l10n.enableNotificationsHint);
- }
+ if (!context.mounted) return;
+ final l10n = AppLocalizations.of(context);
+ showToast(context, l10n.enableNotificationsHint);
}
Future<bool> hasGrantedPermissions() async {
await _ensurePluginInitialized();
-
if (Platform.isIOS) {
- final permissions = await _notificationsPlugin
+ final impl = _notificationsPlugin
.resolvePlatformSpecificImplementation<
IOSFlutterLocalNotificationsPlugin
- >()
- ?.checkPermissions();
-
- return permissions?.isEnabled ?? false;
+ >();
+ return (await impl?.checkPermissions())?.isEnabled ?? false;
}
-
- return await _notificationsPlugin
- .resolvePlatformSpecificImplementation<
- AndroidFlutterLocalNotificationsPlugin
- >()
- ?.areNotificationsEnabled() ??
- false;
+ final impl = _notificationsPlugin
+ .resolvePlatformSpecificImplementation<
+ AndroidFlutterLocalNotificationsPlugin
+ >();
+ return await impl?.areNotificationsEnabled() ?? false;
}
bool shouldShowNotificationsForSharedPhotosAndAlbums() {
diff --git a/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart b/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart
index 5b49cbad04..17cc5005c7 100644
--- a/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart
@@ -229,11 +229,11 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
parent: BouncingScrollPhysics(),
),
scrollDirection: Axis.horizontal,
- itemCount: hasNotificationsPermissions
- ? memories.length
- : memories.length + 1,
+ itemCount:
+ (hasNotificationsPermissions == false ? 1 : 0) +
+ memories.length,
itemBuilder: (context, itemIndex) {
- if (!hasNotificationsPermissions && itemIndex == 0) {
+ if (hasNotificationsPermissions == false && itemIndex == 0) {
return CraftMemories(
width: _memoryWidth * 0.75,
height: _memoryheight,
@@ -245,9 +245,8 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
},
);
}
- final memoryIndex = hasNotificationsPermissions
- ? itemIndex
- : itemIndex - 1;
+ final memoryIndex =
+ itemIndex - (hasNotificationsPermissions == false ? 1 : 0);
return MemoryCoverWidget(
smartMemory: memories[memoryIndex],
allMemories: memories,
diff --git a/mobile/apps/photos/lib/ui/rituals/ritual_editor_dialog.dart b/mobile/apps/photos/lib/ui/rituals/ritual_editor_dialog.dart
index 283162394a..7eb568074a 100644
--- a/mobile/apps/photos/lib/ui/rituals/ritual_editor_dialog.dart
+++ b/mobile/apps/photos/lib/ui/rituals/ritual_editor_dialog.dart
@@ -543,6 +543,7 @@ Future<void> _showRitualEditor(BuildContext context, {Ritual? ritual}) async {
!await NotificationService
.instance
.requestPermissions(
+ // ignore: use_build_context_synchronously
context,
)) {
if (context.mounted) {
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index 50e1e6c743..25bf7fac9d 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -356,6 +356,7 @@ flutter:
- asset: fonts/Nunito-Regular.ttf
- asset: fonts/Nunito-Black.ttf
weight: 900
+
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
# the material Icons class.