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

fix sendTimeInterval and add check for existing live messages

Browse source
This commit is contained in:
Chumva 2018-08-15 13:58:59 +03:00
parent e1eba6ceeb
commit f1c4741076
5 changed files with 69 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
View file

@ -149,6 +149,10 @@ class TelegramApplication : Application(), OsmandHelperListener {
telegramService?.forceLocationUpdate()
}
fun updateSendLocationInterval() {
telegramService?.updateSendLocationInterval(settings.sendMyLocInterval)
}
fun startUserLocationService() {
startTelegramService(TelegramService.USED_BY_USERS_LOCATIONS)
}

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

@ -130,6 +130,10 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
stopForeground(java.lang.Boolean.TRUE)
}
fun updateSendLocationInterval(newInterval: Long) {
sendLocationInterval = newInterval
}
fun forceLocationUpdate() {
val location = getFirstTimeRunDefaultLocation()
app().shareLocationHelper.updateLocation(location)
@ -220,7 +224,7 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
lock.release()
}
app().shareLocationHelper.updateLocation(location)
} else if (System.currentTimeMillis() - lastLocationSentTime > sendLocationInterval) {
} else if (System.currentTimeMillis() - lastLocationSentTime > sendLocationInterval * 1000) {
lastLocationSentTime = System.currentTimeMillis()
app().shareLocationHelper.updateLocation(location)
}

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

@ -548,6 +548,7 @@ class TelegramHelper private constructor() {
liveLocationMessageUpdatesHandler
)
}
chatLiveMessages.remove(chatId)
needRefreshActiveLiveLocationMessages = true
}
@ -557,7 +558,7 @@ class TelegramHelper private constructor() {
}
}
private fun getActiveLiveLocationMessages(onComplete: (() -> Unit)?) {
fun getActiveLiveLocationMessages(onComplete: (() -> Unit)?) {
requestingActiveLiveLocationMessages = true
client?.send(TdApi.GetActiveLiveLocationMessages()) { obj ->
when (obj.constructor) {

84
OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
View file

@ -29,7 +29,7 @@ private const val SELECTED_CHATS_KEY = "selected_chats"
private const val SHARE_LOCATION_CHAT = 1
private const val DEFAULT_CHAT = 0
private const val ADAPTER_UPDATE_INTERVAL_MIL = 30 * 1000L // 30 sec
private const val ADAPTER_UPDATE_INTERVAL_MIL = 5 * 1000L // 5 sec
private const val MESSAGE_ADD_ACTIVE_TIME_SEC = 30 * 60L // 30 min
@ -46,6 +46,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
get() = activity?.application as TelegramApplication
private val telegramHelper get() = app.telegramHelper
private val shareLocationHelper get() = app.shareLocationHelper
private val settings get() = app.settings
private lateinit var appBarLayout: AppBarLayout
@ -183,8 +184,8 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
setOnCheckedChangeListener { _, isChecked ->
if (!isChecked) {
sharingMode = isChecked
app.settings.stopSharingLocationToChats()
app.shareLocationHelper.stopSharingLocation()
settings.stopSharingLocationToChats()
shareLocationHelper.stopSharingLocation()
telegramHelper.stopSendingLiveLocationMessages()
updateContent()
}
@ -206,6 +207,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
override fun onResume() {
super.onResume()
telegramHelper.addChatLiveMessagesListener(this)
telegramHelper.getActiveLiveLocationMessages(null)
updateContent()
updateEnable = true
startHandler()
@ -271,7 +273,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
}
override fun onChatLiveMessagesUpdated(messages: List<TdApi.Message>) {
app.runInUIThread { updateContent() }
updateExistingLiveMessages(messages)
}
fun onPrimaryBtnClick() {
@ -292,23 +294,27 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
private fun startHandler() {
val updateAdapter = Handler()
updateAdapter.postDelayed({
if (sharingMode && updateEnable) {
val iterator = adapter.chats.iterator()
while (iterator.hasNext()) {
val chat = iterator.next()
if (app.settings.getChatLiveMessageExpireTime(chat.id) <= 0) {
app.settings.shareLocationToChat(chat.id, false)
iterator.remove()
if (updateEnable) {
if (sharingMode) {
updateExistingLiveMessages(telegramHelper.getChatLiveMessages().values.toList())
val iterator = adapter.chats.iterator()
while (iterator.hasNext()) {
val chat = iterator.next()
if (settings.getChatLiveMessageExpireTime(chat.id) <= 0) {
settings.shareLocationToChat(chat.id, false)
iterator.remove()
}
}
if (adapter.chats.isNotEmpty()) {
adapter.chats = sortAdapterItems(adapter.chats)
adapter.notifyDataSetChanged()
} else {
sharingMode = false
updateContent()
}
}
if (adapter.chats.isNotEmpty()) {
adapter.notifyDataSetChanged()
} else {
sharingMode = false
updateContent()
}
startHandler()
}
startHandler()
}, ADAPTER_UPDATE_INTERVAL_MIL)
}
@ -442,7 +448,30 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
chats.add(chat)
}
}
adapter.chats = chats
if (sharingMode && settings.hasAnyChatToShareLocation()) {
adapter.chats = sortAdapterItems(chats)
} else {
adapter.chats = chats
}
}
private fun updateExistingLiveMessages(messages: List<TdApi.Message>) {
messages.forEach {
if (settings.isSharingLocationToChat(it.chatId)
&& (settings.getChatShareLocStartSec(it.chatId) == null || settings.getChatLivePeriod(it.chatId) == null)) {
settings.shareLocationToChat(it.chatId, true, (it.content as TdApi.MessageLocation).livePeriod.toLong())
settings.updateChatShareLocStartSec(it.chatId, it.date.toLong())
}
}
sharingMode = settings.hasAnyChatToShareLocation()
if (!shareLocationHelper.sharingLocation && sharingMode && AndroidUtils.isLocationPermissionAvailable(app)) {
shareLocationHelper.startSharingLocation()
}
}
private fun sortAdapterItems(list: MutableList<TdApi.Chat>): MutableList<TdApi.Chat> {
list.sortWith(Comparator<TdApi.Chat> { o1, o2 -> o1.title.compareTo(o2.title) })
return list
}
inner class MyLocationListAdapter : RecyclerView.Adapter<MyLocationListAdapter.BaseViewHolder>() {
@ -481,7 +510,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
val chat = chats[position]
val lastItem = position == itemCount - 1
val placeholderId = if (telegramHelper.isGroup(chat)) R.drawable.img_group_picture else R.drawable.img_user_picture
val live = app.settings.isSharingLocationToChat(chat.id)
val live = settings.isSharingLocationToChat(chat.id)
TelegramUiHelper.setupPhoto(app, holder.icon, chat.photo?.small?.local?.path, placeholderId, false)
holder.title?.text = chat.title
@ -508,8 +537,8 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
holder.itemView.setOnClickListener {
if (live) {
app.settings.shareLocationToChat(chat.id, false)
app.shareLocationHelper.stopSharingLocation()
settings.shareLocationToChat(chat.id, false)
shareLocationHelper.stopSharingLocation()
notifyItemChanged(position)
} else {
holder.checkBox?.apply {
@ -522,7 +551,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
isChecked = live
setOnCheckedChangeListener { _, isChecked ->
if (!isChecked) {
app.settings.shareLocationToChat(chat.id, false)
settings.shareLocationToChat(chat.id, false)
telegramHelper.stopSendingLiveLocationToChat(chat.id)
removeItem(chat)
}
@ -538,16 +567,17 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
}
}
val expiresIn = app.settings.getChatLiveMessageExpireTime(chat.id)
val expiresIn = settings.getChatLiveMessageExpireTime(chat.id)
holder.textInArea?.apply {
visibility = View.VISIBLE
text = "${getText(R.string.plus)} ${OsmandFormatter.getFormattedDuration(context!!,
MESSAGE_ADD_ACTIVE_TIME_SEC)}"
setOnClickListener {
val newLivePeriod = app.settings.getChatLiveMessageExpireTime(chat.id) + MESSAGE_ADD_ACTIVE_TIME_SEC
val newLivePeriod = settings.getChatLiveMessageExpireTime(chat.id) + MESSAGE_ADD_ACTIVE_TIME_SEC
settings.shareLocationToChat(chat.id, false)
telegramHelper.stopSendingLiveLocationToChat(chat.id)
app.settings.shareLocationToChat(chat.id, true, newLivePeriod)
settings.shareLocationToChat(chat.id, true, newLivePeriod)
app.forceUpdateMyLocation()
notifyItemChanged(position)
}
@ -576,7 +606,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener, ChatLiveMessagesList
if (chats.isEmpty()) {
sharingMode = false
updateContent()
app.shareLocationHelper.stopSharingLocation()
shareLocationHelper.stopSharingLocation()
} else {
adapter.notifyDataSetChanged()
}

1
OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
View file

@ -177,6 +177,7 @@ class SettingsDialogFragment : DialogFragment() {
override fun setCurrentValue(index: Int) {
settings.sendMyLocInterval = values[index]
app.updateSendLocationInterval()
}
}