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

add checks in getOsmAndBotDeviceName

Browse source
This commit is contained in:
Chumva 2018-08-03 14:55:07 +03:00
parent 87879559bb
commit 37c8d2b9a0
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -256,9 +256,16 @@ class TelegramHelper private constructor() {
}
fun getOsmAndBotDeviceName(message: TdApi.Message): String {
val replyMarkup = message.replyMarkup as TdApi.ReplyMarkupInlineKeyboard
val deviceName = replyMarkup.rows[0][1].text
return deviceName.split("\\s".toRegex())[1]
var deviceName = ""
if (message.replyMarkup is TdApi.ReplyMarkupInlineKeyboard) {
val replyMarkup = message.replyMarkup as TdApi.ReplyMarkupInlineKeyboard
try {
deviceName = replyMarkup.rows[0][1].text.split("\\s".toRegex())[1]
} catch (e: Exception) {
}
}
return deviceName
}
fun isOsmAndBot(userId: Int) = users[userId]?.username == OSMAND_BOT_USERNAME
@ -895,7 +902,8 @@ class TelegramHelper private constructor() {
val newContent = updateMessageContent.newContent
message.content = if (newContent is TdApi.MessageText) {
parseOsmAndBotLocation(newContent.text.text)
} else if (newContent is TdApi.MessageLocation && isOsmAndBot(message.senderUserId)) {
} else if (newContent is TdApi.MessageLocation &&
(isOsmAndBot(message.senderUserId) || isOsmAndBot(message.viaBotUserId))) {
parseOsmAndBotLocation(message)
} else {
newContent