Skip to content

Commit 73fef26

Browse files
committed
PlayerService/PlayerUIList: some small improvements
1 parent cf8fe95 commit 73fef26

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

app/src/main/java/org/schabi/newpipe/player/PlayerService.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,7 @@ class PlayerService : MediaBrowserServiceCompat() {
295295
}
296296

297297
class LocalBinder internal constructor(playerService: PlayerService) : Binder() {
298-
private val playerService: WeakReference<PlayerService?>
299-
300-
init {
301-
this.playerService = WeakReference<PlayerService?>(playerService)
302-
}
298+
private val playerService = WeakReference<PlayerService?>(playerService)
303299

304300
val service: PlayerService?
305301
get() = playerService.get()
@@ -322,9 +318,9 @@ class PlayerService : MediaBrowserServiceCompat() {
322318
clientPackageName: String,
323319
clientUid: Int,
324320
rootHints: Bundle?
325-
): BrowserRoot {
321+
): BrowserRoot? {
326322
// TODO check if the accessing package has permission to view data
327-
return mediaBrowserImpl!!.onGetRoot(clientPackageName, clientUid, rootHints)
323+
return mediaBrowserImpl?.onGetRoot(clientPackageName, clientUid, rootHints)
328324
}
329325

330326
override fun onLoadChildren(

app/src/main/java/org/schabi/newpipe/player/ui/PlayerUiList.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.schabi.newpipe.util.GuardedByMutex
44
import java.util.Optional
55

66
class PlayerUiList(vararg initialPlayerUis: PlayerUi) {
7-
private var playerUis = GuardedByMutex(mutableListOf<PlayerUi>())
7+
private val playerUis = GuardedByMutex(mutableListOf<PlayerUi>())
88

99
/**
1010
* Creates a [PlayerUiList] starting with the provided player uis. The provided player uis

0 commit comments

Comments
 (0)