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

[Messages] Fix opening messages.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-04-04 23:14:40 +02:00
parent 03c9932b8c
commit 91a6366548
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessageFragment.kt
View File

@ -123,14 +123,26 @@ class MessageFragment : Fragment(), CoroutineScope {
val msg =
if (messageString != null)
app.gson.fromJson(messageString, MessageFull::class.java)?.also {
//it.body = null
it.addedDate = arguments?.getLong("sentDate") ?: System.currentTimeMillis()
if (arguments?.getLong("sentDate") ?: 0L > 0L)
it.addedDate = arguments?.getLong("sentDate") ?: 0L
}
else
app.db.messageDao().getByIdNow(App.profileId, messageId)
// load recipients in sent messages
val teachers by lazy { app.db.teacherDao().getAllNow(App.profileId) }
msg?.recipients?.forEach { recipient ->
if (recipient.fullName == null) {
recipient.fullName = teachers.firstOrNull { it.id == recipient.id }?.fullName ?: ""
}
}
if (msg?.type == TYPE_SENT && msg.senderName == null) {
msg.senderName = app.profile.accountName ?: app.profile.studentNameLong
}
msg?.also {
it.recipients = app.db.messageRecipientDao().getAllByMessageId(it.profileId, it.id)
//it.recipients = app.db.messageRecipientDao().getAllByMessageId(it.profileId, it.id)
if (it.body != null && !it.seen) {
app.db.metadataDao().setSeen(it.profileId, it, true)
}

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.kt
View File

@ -55,7 +55,9 @@ class MessagesListFragment : LazyFragment(), CoroutineScope {
}
val adapter = MessagesAdapter(activity, teachers) {
activity.loadTarget(MainActivity.TARGET_MESSAGES_DETAILS, Bundle(
"messageId" to it.id
))
}
app.db.messageDao().getAllByType(App.profileId, messageType).observe(this@MessagesListFragment, Observer { items ->

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/compose/MessagesComposeFragment.kt
View File

@ -505,7 +505,7 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
activity.snackbar(app.getString(R.string.messages_sent_success), app.getString(R.string.ok))
activity.loadTarget(MainActivity.TARGET_MESSAGES_DETAILS, Bundle(
"messageId" to (event.message.id ?: -1),
"messageId" to event.message.id,
"message" to app.gson.toJson(event.message),
"sentDate" to event.sentDate
))