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

parse new map locations

Browse source
This commit is contained in:
Chumva 2018-08-03 12:21:23 +03:00
parent 77796cb3b3
commit 50e736f5a2
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-telegram/src/net/osmand/telegram/helpers/ShowLocationHelper.kt
View file

@ -79,6 +79,9 @@ class ShowLocationHelper(private val app: TelegramApplication) {
if (userName.isEmpty()) { if (userName.isEmpty()) {
userName = user.phoneNumber userName = user.phoneNumber
} }
if (telegramHelper.isOsmAndBot(user.id)) {
userName = telegramHelper.getOsmAndBotDeviceName(message)
}
photoPath = telegramHelper.getUserPhotoPath(user) photoPath = telegramHelper.getUserPhotoPath(user)
} }
if (userName.isEmpty()) { if (userName.isEmpty()) {

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

@ -253,6 +253,13 @@ 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]
}
fun isOsmAndBot(userId: Int) = users[userId]?.username == OSMAND_BOT_USERNAME fun isOsmAndBot(userId: Int) = users[userId]?.username == OSMAND_BOT_USERNAME
fun isBot(userId: Int) = users[userId]?.type is TdApi.UserTypeBot fun isBot(userId: Int) = users[userId]?.type is TdApi.UserTypeBot

3
OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
View file

@ -131,6 +131,9 @@ object TelegramUiHelper {
if (name.isEmpty()) { if (name.isEmpty()) {
name = user.phoneNumber name = user.phoneNumber
} }
if (helper.isOsmAndBot(user.id)) {
name = helper.getOsmAndBotDeviceName(message)
}
latLon = LatLon(content.location.latitude, content.location.longitude) latLon = LatLon(content.location.latitude, content.location.longitude)
photoPath = helper.getUserPhotoPath(user) photoPath = helper.getUserPhotoPath(user)
placeholderId = R.drawable.img_user_picture placeholderId = R.drawable.img_user_picture