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

Use userId as key for usersLocationMessages instead of messageId

Browse source
This commit is contained in:
Alex Sytnyk 2018-07-02 17:51:06 +03:00
parent d98e870765
commit fbaa4dae6b
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ class TelegramHelper private constructor() {
private val downloadUserFilesMap = ConcurrentHashMap<String, TdApi.User>()
// Can contain TdApi.MessageLocation or TdApi.MessageText from osmand_bot
private val usersLocationMessages = ConcurrentHashMap<Long, TdApi.Message>()
private val usersLocationMessages = ConcurrentHashMap<Int, TdApi.Message>()
private val usersFullInfo = ConcurrentHashMap<Int, TdApi.UserFullInfo>()
private val basicGroupsFullInfo = ConcurrentHashMap<Int, TdApi.BasicGroupFullInfo>()
@ -105,14 +105,9 @@ class TelegramHelper private constructor() {
return users[id]
}
fun getUserMessage(user: TdApi.User): TdApi.Message? {
for (message in usersLocationMessages.values) {
if (message.senderUserId == user.id) {
return message
}
}
return null
}
fun getUserMessage(user: TdApi.User) = usersLocationMessages[user.id]
fun getMessageById(id: Long) = usersLocationMessages.values.firstOrNull { it.id == id }
fun getChatMessages(chatTitle: String): List<TdApi.Message> {
val res = mutableListOf<TdApi.Message>()
@ -779,7 +774,7 @@ class TelegramHelper private constructor() {
}
TdApi.UpdateMessageContent.CONSTRUCTOR -> {
val updateMessageContent = obj as TdApi.UpdateMessageContent
val message = usersLocationMessages[updateMessageContent.messageId]
val message = getMessageById(updateMessageContent.messageId)
if (message != null) {
synchronized(message) {
message.content = updateMessageContent.newContent
@ -796,7 +791,7 @@ class TelegramHelper private constructor() {
val updateNewMessage = obj as TdApi.UpdateNewMessage
val message = updateNewMessage.message
if (message.isAppropriate()) {
usersLocationMessages[message.id] = message
usersLocationMessages[message.senderUserId] = message
val chatTitle = chats[message.chatId]?.title
if (chatTitle != null) {
incomingMessagesListeners.forEach {