sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Feedback] Fix showing wrong names, improve messages filtering by device id.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-02-08 23:12:32 +01:00
parent d48beba307
commit 93e5bce778
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,14 +22,11 @@ import kotlinx.coroutines.*
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.*
import pl.szczodrzynski.edziennik.MainActivity
import pl.szczodrzynski.edziennik.R
import pl.szczodrzynski.edziennik.data.api.events.FeedbackMessageEvent import pl.szczodrzynski.edziennik.data.api.events.FeedbackMessageEvent
import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage
import pl.szczodrzynski.edziennik.databinding.FragmentFeedbackBinding import pl.szczodrzynski.edziennik.databinding.FragmentFeedbackBinding
import pl.szczodrzynski.edziennik.onClick
import pl.szczodrzynski.edziennik.utils.Themes import pl.szczodrzynski.edziennik.utils.Themes
import pl.szczodrzynski.edziennik.utils.Utils import pl.szczodrzynski.edziennik.utils.Utils
import pl.szczodrzynski.edziennik.utils.Utils.openUrl import pl.szczodrzynski.edziennik.utils.Utils.openUrl
@ -82,7 +79,7 @@ class FeedbackFragment : Fragment(), CoroutineScope {
0 to User(0, "Ja", null) 0 to User(0, "Ja", null)
) )
private fun getUser(message: FeedbackMessage): User { private fun getUser(message: FeedbackMessage): User {
val userId = message.devId ?: if (message.received) 1 else 0 val userId = message.devId ?: if (message.received) -message.senderName.crc16() else 0
return users[userId] ?: run { return users[userId] ?: run {
User(userId, message.senderName, message.devImage).also { users[userId] = it } User(userId, message.senderName, message.devImage).also { users[userId] = it }
} }
@ -118,13 +115,11 @@ class FeedbackFragment : Fragment(), CoroutineScope {
} }
private suspend fun loadMessages(messageList: List<FeedbackMessage>? = null) { private suspend fun loadMessages(messageList: List<FeedbackMessage>? = null) {
/*if (messageList != null && messageList.isNotEmpty()) val messages = withContext(Dispatchers.Default) {
return*/
val messages = messageList ?: withContext(Dispatchers.Default) {
if (currentDeviceId == null) if (currentDeviceId == null)
app.db.feedbackMessageDao().allNow messageList ?: app.db.feedbackMessageDao().allNow
else else
app.db.feedbackMessageDao().getByDeviceIdNow(currentDeviceId!!) messageList?.filter { it.deviceId == currentDeviceId } ?: app.db.feedbackMessageDao().getByDeviceIdNow(currentDeviceId!!)
} }
if (messages.isNotEmpty()) { if (messages.isNotEmpty()) {
@ -172,14 +167,14 @@ class FeedbackFragment : Fragment(), CoroutineScope {
} }
if (isDev) { if (isDev) {
messages.firstOrNull { it.received }?.let { messages.firstOrNull { it.received && it.devId == null }?.let {
currentDeviceId = it.deviceId currentDeviceId = it.deviceId
b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}") b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}")
} }
// handle notification intent // handle notification intent
arguments?.getString("feedbackMessageDeviceId")?.let { deviceId -> arguments?.getString("feedbackMessageDeviceId")?.let { deviceId ->
currentDeviceId = deviceId messages.firstOrNull { it.received && it.deviceId == deviceId && it.devId == null }?.let {
messages.firstOrNull { it.received && it.deviceId == deviceId }?.let { currentDeviceId = deviceId
b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}") b.targetDeviceDropDown.setText("${it.senderName} (${it.deviceId}) - ${it.deviceName}")
} }
} }