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

Use messageId as key for usersLocationMessages instead of userId

Browse source
This commit is contained in:
Alex Sytnyk 2018-07-04 12:21:51 +03:00
parent db1e8ee1f0
commit 30fbbb909e
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class TelegramHelper private constructor() {
private val downloadUserFilesMap = ConcurrentHashMap<String, TdApi.User>() private val downloadUserFilesMap = ConcurrentHashMap<String, TdApi.User>()
// value.content can be TdApi.MessageLocation or MessageOsmAndBotLocation // value.content can be TdApi.MessageLocation or MessageOsmAndBotLocation
private val usersLocationMessages = ConcurrentHashMap<Int, TdApi.Message>() private val usersLocationMessages = ConcurrentHashMap<Long, TdApi.Message>()
private val usersFullInfo = ConcurrentHashMap<Int, TdApi.UserFullInfo>() private val usersFullInfo = ConcurrentHashMap<Int, TdApi.UserFullInfo>()
private val basicGroupsFullInfo = ConcurrentHashMap<Int, TdApi.BasicGroupFullInfo>() private val basicGroupsFullInfo = ConcurrentHashMap<Int, TdApi.BasicGroupFullInfo>()
@ -103,13 +103,11 @@ class TelegramHelper private constructor() {
fun getUser(id: Int) = users[id] fun getUser(id: Int) = users[id]
fun getUserMessage(user: TdApi.User) = usersLocationMessages[user.id] fun getUserMessage(user: TdApi.User) =
usersLocationMessages.values.firstOrNull { it.senderUserId == user.id }
fun getMessageById(id: Long) = usersLocationMessages.values.firstOrNull { it.id == id } fun getChatMessages(chatTitle: String) =
usersLocationMessages.values.filter { chats[it.chatId]?.title == chatTitle }
fun getChatMessages(chatTitle: String): List<TdApi.Message> {
return usersLocationMessages.values.filter { chats[it.chatId]?.title == chatTitle }
}
fun getMessages() = usersLocationMessages.values.toList() fun getMessages() = usersLocationMessages.values.toList()
@ -363,7 +361,8 @@ class TelegramHelper private constructor() {
if (oldContent is TdApi.MessageText) { if (oldContent is TdApi.MessageText) {
message.content = parseOsmAndBotLocation(oldContent.text.text) message.content = parseOsmAndBotLocation(oldContent.text.text)
} }
usersLocationMessages[message.senderUserId] = message removeOldMessages(message.senderUserId)
usersLocationMessages[message.id] = message
val chatTitle = chats[message.chatId]?.title val chatTitle = chats[message.chatId]?.title
if (chatTitle != null) { if (chatTitle != null) {
incomingMessagesListeners.forEach { incomingMessagesListeners.forEach {
@ -373,6 +372,16 @@ 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 {
usersLocationMessages.remove(it.id)
}
}
}
}
/** /**
* @chatId Id of the chat * @chatId Id of the chat
* @livePeriod Period for which the location can be updated, in seconds; should be between 60 and 86400 for a live location and 0 otherwise. * @livePeriod Period for which the location can be updated, in seconds; should be between 60 and 86400 for a live location and 0 otherwise.
@ -829,7 +838,7 @@ class TelegramHelper private constructor() {
} }
TdApi.UpdateMessageContent.CONSTRUCTOR -> { TdApi.UpdateMessageContent.CONSTRUCTOR -> {
val updateMessageContent = obj as TdApi.UpdateMessageContent val updateMessageContent = obj as TdApi.UpdateMessageContent
val message = getMessageById(updateMessageContent.messageId) val message = usersLocationMessages[updateMessageContent.messageId]
if (message == null) { if (message == null) {
updateMessageContent.apply { updateMessageContent.apply {
requestMessage(chatId, messageId, this@TelegramHelper::addNewMessage) requestMessage(chatId, messageId, this@TelegramHelper::addNewMessage)