Merge pull request #2576 from nextcloud/fix/neon_framework/android-pu…

…sh-notification-icon
nextcloud · Oct 21, 2024 · d0916fa · d0916fa
2 parents 7c58165 + 296563d
commit d0916fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/neon_framework/lib/src/utils/push_utils.dart b/packages/neon_framework/lib/src/utils/push_utils.dart
@@ -60,7 +60,7 @@ class PushUtils {
     final localNotificationsPlugin = FlutterLocalNotificationsPlugin();
     await localNotificationsPlugin.initialize(
       InitializationSettings(
-        android: const AndroidInitializationSettings('@mipmap/ic_launcher'),
+        android: const AndroidInitializationSettings('@drawable/ic_launcher_outline'),
         linux: LinuxInitializationSettings(
           defaultActionName: localizations.actionOpen,
           defaultIcon: AssetsLinuxIcon('assets/logo.svg'),
@@ -173,7 +173,6 @@ class PushUtils {
                 appName ?? appID,
                 subText: accounts.length > 1 && account != null ? account.humanReadableID : null,
                 groupKey: '${appID}_app',
-                icon: '@mipmap/ic_launcher',
                 largeIcon: largeIconBitmap,
                 when: when?.millisecondsSinceEpoch,
                 color: NcColors.primary,

diff --git a/packages/neon_framework/test/push_utils_test.dart b/packages/neon_framework/test/push_utils_test.dart
@@ -119,7 +119,11 @@ void main() {
       FlutterLocalNotificationsPlatform.instance = localNotificationsPlatform;
       when(
         () => localNotificationsPlatform.initialize(
-          any(),
+          any(
+            that: predicate(
+              (s) => s is AndroidInitializationSettings && s.defaultIcon == '@drawable/ic_launcher_outline',
+            ),
+          ),
           onDidReceiveNotificationResponse: any(named: 'onDidReceiveNotificationResponse'),
         ),
       ).thenAnswer((invocation) async {
@@ -286,7 +290,7 @@ void main() {
                     d.channelName == 'app' &&
                     d.subText == null &&
                     d.groupKey == 'app_app' &&
-                    d.icon == '@mipmap/ic_launcher' &&
+                    d.icon == null &&
                     d.largeIcon == null &&
                     d.when == null &&
                     d.color == NcColors.primary &&
@@ -421,7 +425,7 @@ void main() {
                     d.channelName == 'Files' &&
                     d.subText == null &&
                     d.groupKey == 'files_app' &&
-                    d.icon == '@mipmap/ic_launcher' &&
+                    d.icon == null &&
                     d.largeIcon != null &&
                     d.when == notificationDate.millisecondsSinceEpoch &&
                     d.color == NcColors.primary &&
@@ -469,7 +473,7 @@ void main() {
                     d.channelName == 'app' &&
                     d.subText == null &&
                     d.groupKey == 'app_app' &&
-                    d.icon == '@mipmap/ic_launcher' &&
+                    d.icon == null &&
                     d.largeIcon == null &&
                     d.when == null &&
                     d.color == NcColors.primary &&