Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix TelegramHelper#removeOldMessages

Browse source
This commit is contained in:
Alex Sytnyk 2018-07-09 19:04:03 +03:00
parent 90cc7dd8f4
commit e5e3918029
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
View file

@ -366,7 +366,7 @@ class TelegramHelper private constructor() {
if (oldContent is TdApi.MessageText) {
message.content = parseOsmAndBotLocation(oldContent.text.text)
}
removeOldMessages(message.senderUserId)
removeOldMessages(message.senderUserId, message.chatId)
usersLocationMessages[message.id] = message
val chatTitle = chats[message.chatId]?.title
if (chatTitle != null) {
@ -377,13 +377,13 @@ class TelegramHelper private constructor() {
}
}
private fun removeOldMessages(userId: Int) {
users[userId]?.also { user ->
if (user.username != OSMAND_BOT_USERNAME) {
usersLocationMessages.values.filter { it.senderUserId == userId }.forEach {
private fun removeOldMessages(userId: Int, chatId: Long) {
val user = users[userId]
if (user != null && user.username != OSMAND_BOT_USERNAME) {
usersLocationMessages.values.filter { it.senderUserId == userId && it.chatId == chatId }
.forEach {
usersLocationMessages.remove(it.id)
}
}
}
}