rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: don't delete global

Browse source
This commit is contained in:
rebelonion 2024-03-14 15:09:07 -05:00
parent 4ed74b664b
commit ff036165df
1 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/src/main/java/ani/dantotsu/notifications/CommentNotificationWorker.kt
View file

@ -40,16 +40,21 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
//if we have at least one reply notification, we need to fetch the media titles //if we have at least one reply notification, we need to fetch the media titles
var names = emptyMap<Int, MediaNameFetch.Companion.ReturnedData>() var names = emptyMap<Int, MediaNameFetch.Companion.ReturnedData>()
if (notifications?.any { it.type == 1 || it.type == null } == true) { if (notifications?.any { it.type == 1 || it.type == null } == true) {
val mediaIds = notifications.filter { it.type == 1 || it.type == null }.map { it.mediaId } val mediaIds =
notifications.filter { it.type == 1 || it.type == null }.map { it.mediaId }
names = MediaNameFetch.fetchMediaTitles(mediaIds) names = MediaNameFetch.fetchMediaTitles(mediaIds)
} }
val recentGlobal = PrefManager.getVal<Int>( val recentGlobal = PrefManager.getVal<Int>(
PrefName.RecentGlobalNotification) PrefName.RecentGlobalNotification
)
notifications = notifications?.filter { it.type != 3 || it.notificationId > recentGlobal }?.toMutableList() notifications =
notifications?.filter { it.type != 3 || it.notificationId > recentGlobal }
?.toMutableList()
val newRecentGlobal = notifications?.filter { it.type == 3 }?.maxOfOrNull { it.notificationId } val newRecentGlobal =
notifications?.filter { it.type == 3 }?.maxOfOrNull { it.notificationId }
if (newRecentGlobal != null) { if (newRecentGlobal != null) {
PrefManager.setVal(PrefName.RecentGlobalNotification, newRecentGlobal) PrefManager.setVal(PrefName.RecentGlobalNotification, newRecentGlobal)
} }
@ -59,7 +64,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
1 -> NotificationType.COMMENT_REPLY 1 -> NotificationType.COMMENT_REPLY
2 -> NotificationType.COMMENT_WARNING 2 -> NotificationType.COMMENT_WARNING
3 -> NotificationType.APP_GLOBAL 3 -> NotificationType.APP_GLOBAL
else -> NotificationType.COMMENT_REPLY else -> NotificationType.UNKNOWN
} }
val notification = when (type) { val notification = when (type) {
NotificationType.COMMENT_WARNING -> { NotificationType.COMMENT_WARNING -> {
@ -104,6 +109,10 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
"" ""
) )
} }
NotificationType.UNKNOWN -> {
null
}
} }
if (ActivityCompat.checkSelfPermission( if (ActivityCompat.checkSelfPermission(
@ -111,12 +120,14 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
Manifest.permission.POST_NOTIFICATIONS Manifest.permission.POST_NOTIFICATIONS
) == PackageManager.PERMISSION_GRANTED ) == PackageManager.PERMISSION_GRANTED
) { ) {
NotificationManagerCompat.from(applicationContext) if (notification != null) {
.notify( NotificationManagerCompat.from(applicationContext)
type.id, .notify(
System.currentTimeMillis().toInt(), type.id,
notification System.currentTimeMillis().toInt(),
) notification
)
}
} }
} }
} }
@ -131,7 +142,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
commentId: Int, commentId: Int,
color: String, color: String,
imageUrl: String imageUrl: String
): android.app.Notification { ): android.app.Notification? {
val notification = when (notificationType) { val notification = when (notificationType) {
NotificationType.COMMENT_WARNING -> { NotificationType.COMMENT_WARNING -> {
val intent = Intent(applicationContext, MainActivity::class.java).apply { val intent = Intent(applicationContext, MainActivity::class.java).apply {
@ -155,6 +166,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
.setAutoCancel(true) .setAutoCancel(true)
builder.build() builder.build()
} }
NotificationType.COMMENT_REPLY -> { NotificationType.COMMENT_REPLY -> {
val intent = Intent(applicationContext, MainActivity::class.java).apply { val intent = Intent(applicationContext, MainActivity::class.java).apply {
putExtra("FRAGMENT_TO_LOAD", "COMMENTS") putExtra("FRAGMENT_TO_LOAD", "COMMENTS")
@ -186,6 +198,7 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
} }
builder.build() builder.build()
} }
NotificationType.APP_GLOBAL -> { NotificationType.APP_GLOBAL -> {
val intent = Intent(applicationContext, MainActivity::class.java).apply { val intent = Intent(applicationContext, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
@ -205,6 +218,10 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
.setAutoCancel(true) .setAutoCancel(true)
builder.build() builder.build()
} }
NotificationType.UNKNOWN -> {
null
}
} }
return notification return notification
} }
@ -233,7 +250,8 @@ class CommentNotificationWorker(appContext: Context, workerParams: WorkerParamet
enum class NotificationType(val id: String) { enum class NotificationType(val id: String) {
COMMENT_REPLY(Notifications.CHANNEL_COMMENTS), COMMENT_REPLY(Notifications.CHANNEL_COMMENTS),
COMMENT_WARNING(Notifications.CHANNEL_COMMENT_WARING), COMMENT_WARNING(Notifications.CHANNEL_COMMENT_WARING),
APP_GLOBAL(Notifications.CHANNEL_APP_GLOBAL) APP_GLOBAL(Notifications.CHANNEL_APP_GLOBAL),
UNKNOWN("unknown")
} }
companion object { companion object {