github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-06-13 14:10:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feedback] Hide notification when feedback is open. Fix mixing messages when a thread is open.

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2020-02-09 15:10:03 +01:00
parent bcf3fef303
commit 37ddd643ac
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt
View File

@ -74,18 +74,20 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
}
withContext(Dispatchers.Default) {
app.db.feedbackMessageDao().add(message)
val notification = Notification(
id = System.currentTimeMillis(),
title = "Wiadomość od ${message.senderName}",
text = message.text,
type = Notification.TYPE_FEEDBACK_MESSAGE,
profileId = null,
profileName = "Wiadomość od ${message.senderName}"
).addExtra("action", "feedbackMessage").addExtra("feedbackMessageDeviceId", message.deviceId)
app.db.notificationDao().add(notification)
PostNotifications(app, listOf(notification))
if (!EventBus.getDefault().hasSubscriberForEvent(FeedbackMessageEvent::class.java)) {
val notification = Notification(
id = System.currentTimeMillis(),
title = "Wiadomość od ${message.senderName}",
text = message.text,
type = Notification.TYPE_FEEDBACK_MESSAGE,
profileId = null,
profileName = "Wiadomość od ${message.senderName}"
).addExtra("action", "feedbackMessage").addExtra("feedbackMessageDeviceId", message.deviceId)
app.db.notificationDao().add(notification)
PostNotifications(app, listOf(notification))
}
EventBus.getDefault().postSticky(FeedbackMessageEvent(message))
}
EventBus.getDefault().postSticky(FeedbackMessageEvent(message))
}
private fun sharedEvent(teamCode: String, jsonStr: String, message: String) {