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

Merge pull request #8192 from osmandapp/Suggested_List

Browse source 
Suggested list
This commit is contained in:
max-klaus 2020-01-08 15:06:06 +03:00 committed by GitHub
commit a61bc4343a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
View file

@ -998,12 +998,12 @@ class TelegramSettings(private val app: TelegramApplication) {
} }
fun calcLivePeriod(periods: LinkedList<Long>): Long { fun calcLivePeriod(periods: LinkedList<Long>): Long {
val copy = periods.toLongArray() val sortedPeriods = periods.toLongArray()
copy.sort() sortedPeriods.sort()
return if (copy.size % 2 == 0) { return if (sortedPeriods.size % 2 == 0) {
(copy[copy.size / 2] + copy[copy.size / 2 - 1]) / 2 (sortedPeriods[sortedPeriods.size / 2] + sortedPeriods[sortedPeriods.size / 2 - 1]) / 2
} else { } else {
copy[copy.size / 2] sortedPeriods[sortedPeriods.size / 2]
} }
} }

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

@ -44,7 +44,7 @@ private const val MY_LOCATION_TAB_POS = 0
private const val LIVE_NOW_TAB_POS = 1 private const val LIVE_NOW_TAB_POS = 1
private const val TIMELINE_TAB_POS = 2 private const val TIMELINE_TAB_POS = 2
class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListener, TelegramIncomingMessagesListener, DataSetListener { class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListener, TelegramIncomingMessagesListener {
private val log = PlatformUtil.getLog(MainActivity::class.java) private val log = PlatformUtil.getLog(MainActivity::class.java)
@ -486,7 +486,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
} }
} }
override fun onDataSetChanged() { fun refreshPages() {
viewPager.adapter?.notifyDataSetChanged() viewPager.adapter?.notifyDataSetChanged()
} }
@ -522,7 +522,3 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
} }
} }
} }
interface DataSetListener {
fun onDataSetChanged()
}

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

@ -856,7 +856,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
} else { } else {
settings.shareLocationToChat(lastChat.chat.id, true, lastChat.time) settings.shareLocationToChat(lastChat.chat.id, true, lastChat.time)
app.shareLocationHelper.startSharingLocation() app.shareLocationHelper.startSharingLocation()
(activity as DataSetListener).onDataSetChanged() (activity as MainActivity).refreshPages()
} }
} }