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

Telegram - fix sending live messages

Browse source
This commit is contained in:
crimean 2018-06-09 17:55:14 +03:00
parent b50570b732
commit 74052f02d5
4 changed files with 94 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-telegram/src/main/java/net/osmand/telegram/MainActivity.kt
View file

@ -100,11 +100,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
settings.save()
}
override fun onDestroy() {
super.onDestroy()
telegramHelper.close()
}
override fun onTelegramStatusChanged(prevTelegramAuthorizationState: TelegramAuthorizationState,
newTelegramAuthorizationState: TelegramAuthorizationState) {
runOnUi {
@ -146,6 +141,7 @@ class MainActivity : AppCompatActivity(), TelegramListener {
override fun onSendLiveLicationError(code: Int, message: String) {
log.error("Send live location error: $code - $message")
app.isInternetConnectionAvailable(true)
}
private fun updateChatsList() {

6
OsmAnd-telegram/src/main/java/net/osmand/telegram/TelegramApplication.kt
View file

@ -39,6 +39,12 @@ class TelegramApplication : Application() {
}
}
override fun onTerminate() {
super.onTerminate()
// TODO close telegram api in appropriate place
telegramHelper.close()
}
val isWifiConnected: Boolean
get() {
val mgr = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager

2
OsmAnd-telegram/src/main/java/net/osmand/telegram/helpers/ShareLocationHelper.kt
View file

@ -44,7 +44,7 @@ class ShareLocationHelper(private val app: TelegramApplication) {
if (location != null && app.isInternetConnectionAvailable) {
val shareLocationChats = app.settings.getShareLocationChats()
if (shareLocationChats.isNotEmpty()) {
app.telegramHelper.sendLiveLocation(shareLocationChats, MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC, location.latitude, location.longitude)
app.telegramHelper.sendLiveLocationMessage(shareLocationChats, MAX_LOCATION_MESSAGE_LIVE_PERIOD_SEC, location.latitude, location.longitude)
}
lastLocationMessageSentTime = System.currentTimeMillis()
}

126
OsmAnd-telegram/src/main/java/net/osmand/telegram/helpers/TelegramHelper.kt
View file

@ -1,8 +1,8 @@
package net.osmand.telegram.helpers
import android.text.TextUtils
import net.osmand.telegram.helpers.TelegramHelper.TelegramAuthenticationParameterType.*
import net.osmand.PlatformUtil
import net.osmand.telegram.helpers.TelegramHelper.TelegramAuthenticationParameterType.*
import org.drinkless.td.libcore.telegram.Client
import org.drinkless.td.libcore.telegram.Client.ResultHandler
import org.drinkless.td.libcore.telegram.TdApi
@ -27,6 +27,7 @@ class TelegramHelper private constructor() {
private val chats = ConcurrentHashMap<Long, TdApi.Chat>()
private val chatList = TreeSet<OrderedChat>()
private val chatLiveMessages = ConcurrentHashMap<Long, Long>()
private val usersFullInfo = ConcurrentHashMap<Int, TdApi.UserFullInfo>()
private val basicGroupsFullInfo = ConcurrentHashMap<Int, TdApi.BasicGroupFullInfo>()
@ -61,6 +62,8 @@ class TelegramHelper private constructor() {
private var client: Client? = null
private var haveFullChatList: Boolean = false
private var firstTimeSendingLiveLocation: Boolean = true
private var requestingLiveLocationMessages: Boolean = false
private var authorizationState: AuthorizationState? = null
private var isHaveAuthorization = false
@ -211,12 +214,21 @@ class TelegramHelper private constructor() {
* @latitude Latitude of the location
* @longitude Longitude of the location
*/
fun sendLiveLocation(chatIds: List<Long>, livePeriod: Int = 61, latitude: Double, longitude: Double) {
val lp = livePeriod.coerceAtLeast(61)
val location = TdApi.Location(latitude, longitude)
val content = TdApi.InputMessageLocation(location, lp)
fun sendLiveLocationMessage(chatIds: List<Long>, livePeriod: Int = 61, latitude: Double, longitude: Double) {
if (!requestingLiveLocationMessages) {
if (firstTimeSendingLiveLocation) {
getActiveLiveLocationMessages {
sendLiveLocationImpl(chatIds, livePeriod, latitude, longitude)
}
firstTimeSendingLiveLocation = false
} else {
sendLiveLocationImpl(chatIds, livePeriod, latitude, longitude)
}
}
}
private fun getActiveLiveLocationMessages(onComplete: (() -> Unit)?) {
requestingLiveLocationMessages = true
client?.send(TdApi.GetActiveLiveLocationMessages(), { obj ->
when (obj.constructor) {
TdApi.Error.CONSTRUCTOR -> {
@ -225,49 +237,43 @@ class TelegramHelper private constructor() {
}
TdApi.Messages.CONSTRUCTOR -> {
val messages = (obj as TdApi.Messages).messages
val processedChatIds = mutableListOf<Long>()
if (messages.isNotEmpty()) {
for (msg in messages) {
if (chatIds.contains(msg.chatId)) {
processedChatIds.add(msg.chatId)
client?.send(TdApi.EditMessageLiveLocation(msg.chatId, msg.id, null, location), { o->
when (o.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = o as TdApi.Error
listener?.onSendLiveLicationError(error.code, error.message)
}
else -> listener?.onSendLiveLicationError(-1, "Receive wrong response from TDLib: $o")
}
})
}
}
}
if (chatIds.size != processedChatIds.size) {
val mutableChatIds = chatIds.toMutableList()
mutableChatIds.removeAll(processedChatIds)
for (chatId in mutableChatIds) {
client?.send(TdApi.SendMessage(chatId, 0, false, true, null, content), { o->
when (o.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = o as TdApi.Error
listener?.onSendLiveLicationError(error.code, error.message)
}
else -> listener?.onSendLiveLicationError(-1, "Receive wrong response from TDLib: $o")
}
})
val chatId = msg.chatId
chatLiveMessages[chatId] = msg.id
}
}
onComplete?.invoke()
}
else -> listener?.onSendLiveLicationError(-1, "Receive wrong response from TDLib: $obj")
}
requestingLiveLocationMessages = false
})
}
private fun sendLiveLocationImpl(chatIds: List<Long>, livePeriod: Int = 61, latitude: Double, longitude: Double) {
val lp = livePeriod.coerceAtLeast(61)
val location = TdApi.Location(latitude, longitude)
val content = TdApi.InputMessageLocation(location, lp)
for (chatId in chatIds) {
val msgId = chatLiveMessages[chatId]
if (msgId != null) {
if (msgId != 0L) {
client?.send(TdApi.EditMessageLiveLocation(chatId, msgId, null, location), LiveLocationMessageUpdatesHandler(chatId))
}
} else {
chatLiveMessages[chatId] = 0L
client?.send(TdApi.SendMessage(chatId, 0, false, true, null, content), LiveLocationMessageUpdatesHandler(chatId))
}
}
}
/**
* @chatId Id of the chat
* @message Text of the message
*/
fun sendText(chatId: Long, message: String) {
fun sendTextMessage(chatId: Long, message: String) {
// initialize reply markup just for testing
//val row = arrayOf(TdApi.InlineKeyboardButton("https://telegram.org?1", TdApi.InlineKeyboardButtonTypeUrl()), TdApi.InlineKeyboardButton("https://telegram.org?2", TdApi.InlineKeyboardButtonTypeUrl()), TdApi.InlineKeyboardButton("https://telegram.org?3", TdApi.InlineKeyboardButtonTypeUrl()))
//val replyMarkup = TdApi.ReplyMarkupInlineKeyboard(arrayOf(row, row, row))
@ -296,6 +302,28 @@ class TelegramHelper private constructor() {
}
}
private inner class LiveLocationMessageUpdatesHandler(val chatId: Long): ResultHandler {
override fun onResult(obj: TdApi.Object) {
when (obj.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = obj as TdApi.Error
chatLiveMessages.remove(chatId)
listener?.onSendLiveLicationError(error.code, error.message)
}
else -> {
if (obj is TdApi.Message) {
when (obj.sendingState?.constructor) {
TdApi.MessageSendingStateFailed.CONSTRUCTOR -> {
chatLiveMessages.remove(obj.chatId)
listener?.onSendLiveLicationError(-1, "Live location message ${obj.id} failed to send")
}
}
}
}
}
}
}
private fun onAuthorizationStateUpdated(authorizationState: AuthorizationState?) {
val prevAuthState = getTelegramAuthorizationState()
if (authorizationState != null) {
@ -336,6 +364,7 @@ class TelegramHelper private constructor() {
}
TdApi.AuthorizationStateReady.CONSTRUCTOR -> {
isHaveAuthorization = true
firstTimeSendingLiveLocation = true
log.info("Ready")
}
TdApi.AuthorizationStateLoggingOut.CONSTRUCTOR -> {
@ -495,11 +524,28 @@ class TelegramHelper private constructor() {
chat.unreadMentionCount = updateChat.unreadMentionCount
}
}
TdApi.UpdateMessageSendSucceeded.CONSTRUCTOR -> {
val updateMessageSent = obj as TdApi.UpdateMessageSendSucceeded
TdApi.UpdateMessageSendFailed.CONSTRUCTOR -> {
val updateMessageSendFailed = obj as TdApi.UpdateMessageSendFailed
val message = updateMessageSendFailed.message
chatLiveMessages.remove(message.chatId)
}
TdApi.UpdateMessageSendSucceeded.CONSTRUCTOR -> {
val updateMessageSendSucceeded = obj as TdApi.UpdateMessageSendSucceeded
val message = updateMessageSendSucceeded.message
chatLiveMessages[message.chatId] = message.id
}
TdApi.UpdateDeleteMessages.CONSTRUCTOR -> {
val updateDeleteMessages = obj as TdApi.UpdateDeleteMessages
if (updateDeleteMessages.isPermanent) {
val chatId = updateDeleteMessages.chatId
for (messageId in updateDeleteMessages.messageIds) {
if (chatLiveMessages[chatId] == messageId) {
chatLiveMessages.remove(chatId)
break
}
}
}
}
TdApi.UpdateChatReplyMarkup.CONSTRUCTOR -> {
val updateChat = obj as TdApi.UpdateChatReplyMarkup
val chat = chats[updateChat.chatId]
@ -537,7 +583,7 @@ class TelegramHelper private constructor() {
val updateSupergroupFullInfo = obj as TdApi.UpdateSupergroupFullInfo
supergroupsFullInfo[updateSupergroupFullInfo.supergroupId] = updateSupergroupFullInfo.supergroupFullInfo
}
}// print("Unsupported update:" + newLine + object);
}
}
}