sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 12:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt fixing blank notifications

Browse source
This commit is contained in:
Phillip Thelen 2024-01-10 15:56:30 +01:00
parent 6715566ece
commit 486a1d451b
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
View file

@ -50,6 +50,10 @@ abstract class HabiticaLocalNotification(
notificationBuilder = notificationBuilder.setContentText(message)
}
if (this.title == null && this.message == null) {
return
}
val notificationId = getNotificationID(data)
this.setNotificationActions(notificationId, data)

24
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
View file

@ -134,11 +134,6 @@ class PushNotificationManager(
fun displayNotification(remoteMessage: RemoteMessage, context: Context, pushNotificationManager: PushNotificationManager? = null) {
val remoteMessageIdentifier = remoteMessage.data["identifier"]
val notificationFactory = HabiticaLocalNotificationFactory()
val notification = notificationFactory.build(
remoteMessageIdentifier,
context
)
if (pushNotificationManager?.userIsSubscribedToNotificationType(remoteMessageIdentifier) != false) {
if (remoteMessage.data.containsKey("sendAnalytics")) {
val additionalData = HashMap<String, Any>()
@ -150,8 +145,23 @@ class PushNotificationManager(
additionalData
)
}
notification.setExtras(remoteMessage.data)
notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"], remoteMessage.data)
val notification = remoteMessage.notification
if (notification != null) {
val notificationManager = NotificationManagerCompat.from(context)
notificationManager.notify(notification.channelId, notification)
} else {
val notificationFactory = HabiticaLocalNotificationFactory()
val localNotification = notificationFactory.build(
remoteMessageIdentifier,
context
)
localNotification.setExtras(remoteMessage.data)
localNotification.notifyLocally(
remoteMessage.data["title"],
remoteMessage.data["body"],
remoteMessage.data
)
}
}
}
}