Skip to content

Commit 487f08c

Browse files
committed
PlayerService: Convert to kotlin (mechanical)
No adjustments done yet; only change is that I added an upper bound on `PlayerUi` to the `PlayerUiList` functions, so “everything” is now `null` in `destroyAll`.
1 parent 25b35f6 commit 487f08c

5 files changed

Lines changed: 215 additions & 207 deletions

File tree

app/src/main/java/org/schabi/newpipe/player/Player.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,15 +481,15 @@ private void initUIsForCurrentPlayerType() {
481481

482482
switch (playerType) {
483483
case MAIN:
484-
UIs.destroyAll(PopupPlayerUi.class);
484+
UIs.destroyAllOfType(PopupPlayerUi.class);
485485
UIs.addAndPrepare(new MainPlayerUi(this, binding));
486486
break;
487487
case POPUP:
488-
UIs.destroyAll(MainPlayerUi.class);
488+
UIs.destroyAllOfType(MainPlayerUi.class);
489489
UIs.addAndPrepare(new PopupPlayerUi(this, binding));
490490
break;
491491
case AUDIO:
492-
UIs.destroyAll(VideoPlayerUi.class);
492+
UIs.destroyAllOfType(VideoPlayerUi.class);
493493
break;
494494
}
495495
}
@@ -595,7 +595,7 @@ public void destroy() {
595595
databaseUpdateDisposable.clear();
596596
progressUpdateDisposable.set(null);
597597

598-
UIs.destroyAll(Object.class); // destroy every UI: obviously every UI extends Object
598+
UIs.destroyAllOfType(null);
599599
}
600600

601601
public void setRecovery() {
@@ -1971,6 +1971,9 @@ public void setFragmentListener(final PlayerServiceEventListener listener) {
19711971
triggerProgressUpdate();
19721972
}
19731973

1974+
/** Remove the listener, if it was set.
1975+
* @param listener listener to remove
1976+
* */
19741977
public void removeFragmentListener(final PlayerServiceEventListener listener) {
19751978
if (fragmentListener == listener) {
19761979
fragmentListener = null;
@@ -1985,6 +1988,9 @@ void setActivityListener(final PlayerEventListener listener) {
19851988
triggerProgressUpdate();
19861989
}
19871990

1991+
/** Remove the listener, if it was set.
1992+
* @param listener listener to remove
1993+
* */
19881994
void removeActivityListener(final PlayerEventListener listener) {
19891995
if (activityListener == listener) {
19901996
activityListener = null;

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

Lines changed: 0 additions & 196 deletions
This file was deleted.

0 commit comments

Comments
 (0)