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

add new status for incoming messages

Browse source
This commit is contained in:
Chumva 2019-01-25 19:02:43 +02:00
parent 7b41a03c47
commit eedcf67d35
5 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,6 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
override fun onDestroy() {
super.onDestroy()
val app = app()
app.locationMessages.saveMessages()
app.telegramHelper.stopLiveMessagesUpdates()
app.telegramHelper.removeIncomingMessagesListener(this)
app.telegramHelper.removeOutgoingMessagesListener(this)
@ -278,7 +277,7 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
override fun onReceiveChatLocationMessages(chatId: Long, vararg messages: TdApi.Message) {
app().showLocationHelper.startShowMessagesTask(chatId, *messages)
messages.forEach {
val locationMessage = OsmandLocationUtils.parseMessage(it, app().telegramHelper, LocationMessages.LocationMessage.STATUS_SENT)
val locationMessage = OsmandLocationUtils.parseMessage(it, app().telegramHelper, LocationMessages.LocationMessage.STATUS_INCOMING)
if (locationMessage != null) {
app().locationMessages.addLocationMessage(locationMessage)
}

53
OsmAnd-telegram/src/net/osmand/telegram/helpers/LocationMessages.kt
View file

@ -4,15 +4,11 @@ import android.content.Context
import android.database.Cursor
import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteOpenHelper
import net.osmand.PlatformUtil
import net.osmand.telegram.TelegramApplication
import org.apache.commons.logging.Log
import java.util.*
import kotlin.collections.ArrayList
class LocationMessages(val app: TelegramApplication) {
private val log: Log = PlatformUtil.getLog(LocationMessages::class.java)
private val locationMessages = ArrayList<LocationMessage>()
private val sqliteHelper: SQLiteHelper
@ -28,7 +24,7 @@ class LocationMessages(val app: TelegramApplication) {
fun getPreparedToShareMessages(): List<LocationMessage> {
val currentUserId = app.telegramHelper.getCurrentUserId()
return locationMessages.filter { it.userId == currentUserId && it.status == LocationMessage.STATUS_PREPARING }.sortedBy { it.date }
return locationMessages.filter { it.userId == currentUserId && it.status == LocationMessage.STATUS_PREPARED }.sortedBy { it.date }
}
fun getOutgoingMessagesToChat(chatId: Long): List<LocationMessage> {
@ -47,28 +43,12 @@ class LocationMessages(val app: TelegramApplication) {
}
fun getIncomingMessages(): List<LocationMessage> {
val currentUserId = app.telegramHelper.getCurrentUserId()
return locationMessages.filter { it.userId != currentUserId }.sortedBy { it.date }
return locationMessages.filter { it.status != LocationMessage.STATUS_INCOMING }.sortedBy { it.date }
}
fun addLocationMessage(locationMessage: LocationMessage) {
log.debug("addLocationMessage $locationMessage")
synchronized(locationMessages) {
locationMessages.add(locationMessage)
}
}
fun removeMessage(locationMessage: LocationMessage) {
synchronized(locationMessages) {
locationMessages.remove(locationMessage)
}
}
fun saveMessages() {
clearMessages()
synchronized(locationMessages) {
sqliteHelper.addLocationMessages(locationMessages)
}
locationMessages.add(locationMessage)
sqliteHelper.addLocationMessage(locationMessage)
}
fun clearMessages() {
@ -92,9 +72,7 @@ class LocationMessages(val app: TelegramApplication) {
private fun readMessages() {
val messages = sqliteHelper.getLocationMessages()
synchronized(locationMessages) {
locationMessages.addAll(messages)
}
locationMessages.addAll(messages)
}
private class SQLiteHelper(context: Context) :
@ -117,8 +95,14 @@ class LocationMessages(val app: TelegramApplication) {
}
}
internal fun getLocationMessages(): Set<LocationMessage> {
val res = HashSet<LocationMessage>()
internal fun addLocationMessage(locationMessage: LocationMessage) {
writableDatabase?.execSQL(TRACKS_TABLE_INSERT,
arrayOf(locationMessage.userId, locationMessage.chatId, locationMessage.lat, locationMessage.lon, locationMessage.altitude, locationMessage.speed,
locationMessage.hdop, locationMessage.bearing, locationMessage.date, locationMessage.type, locationMessage.status, locationMessage.messageId))
}
internal fun getLocationMessages(): List<LocationMessage> {
val res = ArrayList<LocationMessage>()
readableDatabase?.rawQuery(TRACKS_TABLE_SELECT, null)?.apply {
if (moveToFirst()) {
do {
@ -166,10 +150,8 @@ class LocationMessages(val app: TelegramApplication) {
private const val TRACK_COL_SPEED = "speed"
private const val TRACK_COL_HDOP = "hdop"
private const val TRACK_COL_BEARING = "bearing"
private const val TRACK_COL_TYPE =
"type" // 0 = user map message, 1 = user text message, 2 = bot map message, 3 = bot text message
private const val TRACK_COL_MESSAGE_STATUS =
"status" // 0 = preparing , 1 = pending, 2 = sent, 3 = error
private const val TRACK_COL_TYPE = "type" // 0 = user map message, 1 = user text message, 2 = bot map message, 3 = bot text message
private const val TRACK_COL_MESSAGE_STATUS = "status" // 0 = preparing , 1 = pending, 2 = sent, 3 = error
private const val TRACK_COL_MESSAGE_ID = "message_id"
private const val TRACK_DATE_INDEX = "date_index"
@ -206,10 +188,11 @@ class LocationMessages(val app: TelegramApplication) {
companion object {
const val STATUS_PREPARING = 0
const val STATUS_PREPARED = 0
const val STATUS_PENDING = 1
const val STATUS_SENT = 2
const val STATUS_ERROR = 3
const val STATUS_INCOMING = 4
const val TYPE_USER_MAP = 0
const val TYPE_USER_TEXT = 1

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

@ -154,7 +154,7 @@ class ShareLocationHelper(private val app: TelegramApplication) {
chatsShareInfo.values.forEach { shareInfo ->
types.forEach {
val message = LocationMessage(userId, shareInfo.chatId, latitude, longitude, location.altitude, location.speed.toDouble(),
location.accuracy.toDouble(), location.bearing.toDouble(), location.time, it, LocationMessage.STATUS_PREPARING, shareInfo.currentMapMessageId)
location.accuracy.toDouble(), location.bearing.toDouble(), location.time, it, LocationMessage.STATUS_PREPARED, shareInfo.currentMapMessageId)
app.locationMessages.addLocationMessage(message)
}
}

3
OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
View file

@ -184,7 +184,6 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
override fun onStop() {
super.onStop()
settings.save()
app.locationMessages.saveMessages()
}
override fun onDestroy() {
@ -294,7 +293,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
}
if (app.telegramService == null) {
messages.forEach {
val locationMessage = OsmandLocationUtils.parseMessage(it, telegramHelper, LocationMessages.LocationMessage.STATUS_SENT)
val locationMessage = OsmandLocationUtils.parseMessage(it, telegramHelper, LocationMessages.LocationMessage.STATUS_INCOMING)
if (locationMessage != null) {
app.locationMessages.addLocationMessage(locationMessage)
}

2
OsmAnd-telegram/src/net/osmand/telegram/utils/OsmandLocationUtils.kt
View file

@ -106,7 +106,7 @@ object OsmandLocationUtils {
}
if (parsedMessageContent != null) {
locationMessage = LocationMessages.LocationMessage(message.senderUserId, message.chatId, parsedMessageContent.lat,
locationMessage = LocationMessages.LocationMessage(helper.getSenderMessageId(message), message.chatId, parsedMessageContent.lat,
parsedMessageContent.lon, parsedMessageContent.altitude, parsedMessageContent.speed, parsedMessageContent.hdop,
parsedMessageContent.bearing, parsedMessageContent.lastUpdated * 1000L, messageType, status, message.id)
}