Funkwhale/Otter-App-Android-Funkwhale
1
0
Fork 0
mirror of https://github.com/apognu/otter synced 2025-02-17 11:20:34 +01:00
Code Issues Releases Wiki Activity

QueueNavigator now returns queue index.

Browse Source
This commit is contained in:
Antoine POPINEAU 2020-07-12 15:19:33 +02:00
parent 7035f073f2
commit e7cb5e4c6e
No known key found for this signature in database
GPG Key ID: A78AC64694F84063
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
View File

@ -129,7 +129,6 @@ class SearchActivity : AppCompatActivity() {
if (download.state == Download.STATE_COMPLETED) {
download.getMetadata()?.let { info ->
adapter.tracks.withIndex().associate { it.value to it.index }.filter { it.key.id == info.id }.toList().getOrNull(0)?.let { match ->
log(match)
withContext(Dispatchers.Main) {
adapter.tracks[match.second].downloaded = true
adapter.notifyItemChanged(adapter.getPositionOf(SearchAdapter.ResultType.Track, match.second))

2
app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt
View File

@ -93,7 +93,7 @@ class OtterQueueNavigator : MediaSessionConnector.QueueNavigator {
CommandBus.send(Command.NextTrack)
}
override fun getActiveQueueItemId(player: Player?) = 0L
override fun getActiveQueueItemId(player: Player?) = player?.currentWindowIndex?.toLong() ?: 0
override fun onSkipToPrevious(player: Player, controlDispatcher: ControlDispatcher) {
CommandBus.send(Command.PreviousTrack)

25
app/src/main/java/com/github/apognu/otter/utils/Util.kt
View File

@ -12,8 +12,29 @@ fun Context?.toast(message: String, length: Int = Toast.LENGTH_SHORT) {
}
}
fun Any.log(message: Any) {
Log.d("OTTER", "${javaClass.simpleName}: $message")
private fun logClassName(): String {
val known = setOf(
"dalvik.system.VMStack",
"java.lang.Thread",
"com.github.apognu.otter.utils.UtilKt"
)
Thread.currentThread().stackTrace.forEach {
if (!known.contains(it.className)) {
val className = it.className.split('.').last()
val line = it.lineNumber
return "$className:$line"
}
}
return "UNKNOWN"
}
fun Any?.log(prefix: String? = null) {
prefix?.let {
Log.d("OTTER", "${logClassName()} - $prefix: $this")
} ?: Log.d("OTTER", "${logClassName()} - $this")
}
fun maybeNormalizeUrl(rawUrl: String?): String? {