github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 19:04:38 -06: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
Show Stats 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) {

11
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
View File

@ -70,9 +70,14 @@ class FeedbackFragment : Fragment(), CoroutineScope {
fun onFeedbackMessageEvent(event: FeedbackMessageEvent) {
EventBus.getDefault().removeStickyEvent(event)
val message = event.message
val chatMessage = getChatMessage(message)
if (message.received) chatView.receive(chatMessage)
else chatView.send(chatMessage)
if (currentDeviceId != null && message.deviceId == currentDeviceId) {
val chatMessage = getChatMessage(message)
if (message.received) chatView.receive(chatMessage)
else chatView.send(chatMessage)
}
else {
Toast.makeText(context, "${message.senderName}: Nowa wiadomość w innym wątku.", Toast.LENGTH_LONG).show()
}
}
private val users = mutableMapOf(