From b1ea1e5db7e88c15655e0f0b09f7b47a2eb5fb3a Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Fri, 3 Aug 2018 13:06:36 +0300
Subject: [PATCH] Fix parsing of OsmAndBot`s location messages

---
 .../osmand/telegram/helpers/TelegramHelper.kt | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
index 3cd053c849..4b5c627824 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
@@ -7,7 +7,6 @@ import org.drinkless.td.libcore.telegram.Client
 import org.drinkless.td.libcore.telegram.Client.ResultHandler
 import org.drinkless.td.libcore.telegram.TdApi
 import org.drinkless.td.libcore.telegram.TdApi.AuthorizationState
-import org.json.JSONObject
 import java.io.File
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
@@ -28,6 +27,9 @@ class TelegramHelper private constructor() {
 		private const val UPDATE_LIVE_MESSAGES_INTERVAL_SEC = 30L
 		private const val MESSAGE_ACTIVE_TIME_SEC = 24 * 60 * 60 // 24 hours
 
+		private const val DEVICE_PREFIX = "Device: "
+		private const val LOCATION_PREFIX = "Location: "
+
 		// min and max values for the Telegram API
 		const val MIN_LOCATION_MESSAGE_LIVE_PERIOD_SEC = 61
 		const val MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC = 60 * 60 * 24 - 1 // one day
@@ -640,38 +642,40 @@ class TelegramHelper private constructor() {
 		}
 	}
 
-	private fun parseOsmAndBotLocation(json: String): MessageOsmAndBotLocation {
-		val obj = JSONObject(json)
-		return MessageOsmAndBotLocation(
-			obj.optString("name", ""),
-			obj.optDouble("lat", -1.0),
-			obj.optDouble("lon", -1.0),
-			obj.optDouble("alt", -1.0),
-			obj.optDouble("azi", -1.0),
-			obj.optDouble("spd", -1.0),
-			obj.optInt("updAgo", -1),
-			obj.optInt("locAgo", -1),
-			obj.optInt("updId", -1),
-			obj.optInt("updTime", -1)
-		)
+	private fun parseOsmAndBotLocation(text: String): MessageOsmAndBotLocation {
+		val res = MessageOsmAndBotLocation()
+		for (s in text.lines()) {
+			when {
+				s.startsWith(DEVICE_PREFIX) -> {
+					res.name = s.removePrefix(DEVICE_PREFIX)
+				}
+				s.startsWith(LOCATION_PREFIX) -> {
+					val locStr = s.removePrefix(LOCATION_PREFIX)
+					try {
+						val (latS, lonS) = locStr.split(" ")
+						res.lat = latS.dropLast(1).toDouble()
+						res.lon = lonS.toDouble()
+					} catch (e: Exception) {
+						e.printStackTrace()
+					}
+				}
+			}
+		}
+		return res
 	}
 
-	class MessageOsmAndBotLocation internal constructor(
-		val name: String,
-		val lat: Double,
-		val lon: Double,
-		val alt: Double,
-		val azi: Double,
-		val spd: Double,
-		val updAgo: Int,
-		val locAgo: Int,
-		val updId: Int,
-		val updTime: Int
-	) : TdApi.MessageContent() {
+	class MessageOsmAndBotLocation : TdApi.MessageContent() {
+
+		var name: String = ""
+			internal set
+		var lat: Double = Double.NaN
+			internal set
+		var lon: Double = Double.NaN
+			internal set
 
 		override fun getConstructor() = -1
 
-		fun isValid() = name != "" && lat != -1.0 && lon != -1.0
+		fun isValid() = name != "" && lat != Double.NaN && lon != Double.NaN
 	}
 
 	class OrderedChat internal constructor(internal val order: Long, internal val chatId: Long, internal val isChannel: Boolean) : Comparable<OrderedChat> {