jellyfin/jellyfin-androidtv
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-androidtv.git synced 2025-03-01 11:18:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix app closing when media finishes playing

Browse Source
This commit is contained in:
Niels van Velzen 2023-05-12 21:52:39 +02:00 committed by Niels van Velzen
parent c1c08e8079
commit 2e4aa21db2
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
View File

@ -184,7 +184,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
mItemsToPlay = videoQueueManager.getValue().getCurrentVideoQueue();
if (mItemsToPlay == null || mItemsToPlay.size() == 0) {
Utils.showToast(requireContext(), getString(R.string.msg_no_playable_items));
finish();
closePlayer();
return;
}
@ -434,7 +434,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
} else if (mGuideVisible) {
hideGuide();
} else {
finish();
closePlayer();
}
}
};
@ -533,7 +533,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
}
if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP) {
finish();
closePlayer();
return true;
}
@ -697,7 +697,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
if (!getActive()) return;
Utils.showToast(requireContext(), R.string.msg_video_playback_error);
finish();
closePlayer();
}
});
}
@ -1443,7 +1443,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
});
}
public void finish() {
public void closePlayer() {
if (navigationRepository.getValue().getCanGoBack()) {
navigationRepository.getValue().goBack();
} else {

12
app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
View File

@ -301,7 +301,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
mPlaybackState = PlaybackState.ERROR;
if (mFragment != null) {
Utils.showToast(mFragment.getContext(), mFragment.getString(R.string.too_many_errors));
mFragment.finish();
mFragment.closePlayer();
}
}
}
@ -479,7 +479,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
Timber.d("item is null - aborting play");
if (mFragment != null) {
Utils.showToast(mFragment.getContext(), mFragment.getString(R.string.msg_cannot_play));
mFragment.requireActivity().finish();
mFragment.closePlayer();
}
return;
}
@ -499,7 +499,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
.setNegativeButton(R.string.lbl_no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mFragment.requireActivity().finish();
mFragment.closePlayer();
}
})
.create()
@ -511,7 +511,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
.setPositiveButton(R.string.lbl_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mFragment.requireActivity().finish();
mFragment.closePlayer();
}
})
.create()
@ -758,7 +758,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
} catch (InterruptedException e) {
Timber.e(e);
}
if (mFragment != null) mFragment.finish();
if (mFragment != null) mFragment.closePlayer();
}
private void startItem(org.jellyfin.sdk.model.api.BaseItemDto item, long position, StreamInfo response) {
@ -1135,7 +1135,7 @@ public class PlaybackController implements PlaybackControllerNotifiable {
}
public void endPlayback(Boolean closeActivity) {
if (closeActivity && mFragment != null) mFragment.getActivity().finish();
if (closeActivity && mFragment != null) mFragment.closePlayer();
stop();
if (mVideoManager != null)
mVideoManager.destroy();

2
app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackOverlayFragmentHelper.kt
View File

@ -4,7 +4,7 @@ import org.jellyfin.androidtv.ui.ScreensaverViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel
class PlaybackOverlayFragmentHelper(
private val fragment: CustomPlaybackOverlayFragment
val fragment: CustomPlaybackOverlayFragment
) {
private val screensaverViewModel by fragment.activityViewModel<ScreensaverViewModel>()
private var screensaverLock: (() -> Unit)? = null

2
app/src/main/java/org/jellyfin/androidtv/ui/playback/VideoManager.java
View File

@ -329,7 +329,7 @@ public class VideoManager implements IVLCVout.OnNewVideoLayoutListener {
if (nativeMode) {
if (mExoPlayer == null) {
Timber.e("mExoPlayer should not be null!!");
mActivity.finish();
_helper.getFragment().closePlayer();
return;
}
mExoPlayer.setPlayWhenReady(true);