QueueNavigator now returns queue index.
This commit is contained in:
parent
7035f073f2
commit
e7cb5e4c6e
|
@ -129,7 +129,6 @@ class SearchActivity : AppCompatActivity() {
|
||||||
if (download.state == Download.STATE_COMPLETED) {
|
if (download.state == Download.STATE_COMPLETED) {
|
||||||
download.getMetadata()?.let { info ->
|
download.getMetadata()?.let { info ->
|
||||||
adapter.tracks.withIndex().associate { it.value to it.index }.filter { it.key.id == info.id }.toList().getOrNull(0)?.let { match ->
|
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) {
|
withContext(Dispatchers.Main) {
|
||||||
adapter.tracks[match.second].downloaded = true
|
adapter.tracks[match.second].downloaded = true
|
||||||
adapter.notifyItemChanged(adapter.getPositionOf(SearchAdapter.ResultType.Track, match.second))
|
adapter.notifyItemChanged(adapter.getPositionOf(SearchAdapter.ResultType.Track, match.second))
|
||||||
|
|
|
@ -93,7 +93,7 @@ class OtterQueueNavigator : MediaSessionConnector.QueueNavigator {
|
||||||
CommandBus.send(Command.NextTrack)
|
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) {
|
override fun onSkipToPrevious(player: Player, controlDispatcher: ControlDispatcher) {
|
||||||
CommandBus.send(Command.PreviousTrack)
|
CommandBus.send(Command.PreviousTrack)
|
||||||
|
|
|
@ -12,8 +12,29 @@ fun Context?.toast(message: String, length: Int = Toast.LENGTH_SHORT) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Any.log(message: Any) {
|
private fun logClassName(): String {
|
||||||
Log.d("OTTER", "${javaClass.simpleName}: $message")
|
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? {
|
fun maybeNormalizeUrl(rawUrl: String?): String? {
|
||||||
|
|
Loading…
Reference in New Issue