Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Final lint

This commit is contained in:
Maxence G 2022-07-02 21:58:45 +02:00
parent d6aebd9989
commit 16b3fcad32
No known key found for this signature in database
GPG Key ID: DC1FD9409E3FE284
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
View File

@ -756,21 +756,26 @@ class PlayerFragment :
mediaPlayerController.controller?.setRating( mediaPlayerController.controller?.setRating(
HeartRating(!isStarred) HeartRating(!isStarred)
)?.let { )?.let {
Futures.addCallback(it, object : FutureCallback<SessionResult> { Futures.addCallback(
override fun onSuccess(result: SessionResult?) { it,
if (isStarred) { object : FutureCallback<SessionResult> {
starMenuItem.icon = hollowStar override fun onSuccess(result: SessionResult?) {
currentSong!!.starred = false if (isStarred) {
} else { starMenuItem.icon = hollowStar
starMenuItem.icon = fullStar currentSong!!.starred = false
currentSong!!.starred = true } else {
starMenuItem.icon = fullStar
currentSong!!.starred = true
}
} }
}
override fun onFailure(t: Throwable) { override fun onFailure(t: Throwable) {
Toast.makeText(context, "SetRating failed", Toast.LENGTH_SHORT).show() Toast.makeText(context, "SetRating failed", Toast.LENGTH_SHORT)
} .show()
}, this.executorService) }
},
this.executorService
)
} }
return true return true

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/AutoMediaBrowserCallback.kt
View File

@ -213,7 +213,6 @@ class AutoMediaBrowserCallback(var player: Player) :
args: Bundle args: Bundle
): ListenableFuture<SessionResult> { ): ListenableFuture<SessionResult> {
var customCommandFuture: ListenableFuture<SessionResult>? = null var customCommandFuture: ListenableFuture<SessionResult>? = null
when (customCommand.customAction) { when (customCommand.customAction) {
@ -245,7 +244,8 @@ class AutoMediaBrowserCallback(var player: Player) :
LENGTH_SHORT LENGTH_SHORT
).show() ).show()
} }
}, MoreExecutors.directExecutor() },
MoreExecutors.directExecutor()
) )
} }
} }

20
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt
View File

@ -595,15 +595,19 @@ class MediaPlayerController(
HeartRating(!song.starred) HeartRating(!song.starred)
).let { ).let {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && it != null) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && it != null) {
Futures.addCallback(it, object : FutureCallback<SessionResult> { Futures.addCallback(
override fun onSuccess(result: SessionResult?) { it,
updateStarred() object : FutureCallback<SessionResult> {
} override fun onSuccess(result: SessionResult?) {
updateStarred()
}
override fun onFailure(t: Throwable) { override fun onFailure(t: Throwable) {
TODO("Not yet implemented") TODO("Not yet implemented")
} }
}, context.mainExecutor) },
context.mainExecutor
)
} else { } else {
updateStarred() updateStarred()
} }