|
|
@ -92,23 +92,23 @@ class PushUtils { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
final appID = notification?.app ?? pushNotification.subject.app ?? 'nextcloud'; |
|
|
|
final appID = notification?.app ?? pushNotification.subject.app ?? 'nextcloud'; |
|
|
|
var appName = localizations.appImplementationName(appID); |
|
|
|
String? appName = localizations.appImplementationName(appID); |
|
|
|
if (appName == '') { |
|
|
|
if (appName == '') { |
|
|
|
debugPrint('Missing app name for $appID'); |
|
|
|
debugPrint('Missing app name for $appID'); |
|
|
|
appName = appID; |
|
|
|
appName = null; |
|
|
|
} |
|
|
|
} |
|
|
|
final title = notification?.subject ?? pushNotification.subject.subject; |
|
|
|
final title = (notification?.subject ?? pushNotification.subject.subject)!; |
|
|
|
final message = notification != null && notification.message != '' ? notification.message : null; |
|
|
|
final message = (notification?.message.isNotEmpty ?? false) ? notification!.message : null; |
|
|
|
final when = notification != null ? DateTime.parse(notification.datetime) : null; |
|
|
|
final when = notification != null ? DateTime.parse(notification.datetime) : null; |
|
|
|
|
|
|
|
|
|
|
|
await localNotificationsPlugin.show( |
|
|
|
await localNotificationsPlugin.show( |
|
|
|
_getNotificationID(instance, pushNotification), |
|
|
|
_getNotificationID(instance, pushNotification), |
|
|
|
message != null ? '$appName: $title' : appName, |
|
|
|
message != null && appName != null ? '$appName: $title' : title, |
|
|
|
message ?? title, |
|
|
|
message, |
|
|
|
NotificationDetails( |
|
|
|
NotificationDetails( |
|
|
|
android: AndroidNotificationDetails( |
|
|
|
android: AndroidNotificationDetails( |
|
|
|
appID, |
|
|
|
appID, |
|
|
|
appName, |
|
|
|
appName ?? appID, |
|
|
|
subText: accounts.length > 1 && account != null ? account.client.humanReadableID : null, |
|
|
|
subText: accounts.length > 1 && account != null ? account.client.humanReadableID : null, |
|
|
|
groupKey: 'app_$appID', |
|
|
|
groupKey: 'app_$appID', |
|
|
|
icon: '@mipmap/ic_launcher', |
|
|
|
icon: '@mipmap/ic_launcher', |
|
|
|