mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 00:20:32 +00:00
Code Issues Releases Wiki Activity

Improved docs, format and code style

Browse Source
This commit is contained in:
litetex 2022-05-03 19:19:21 +02:00
parent a68c6a2cfc
commit d2967f514b
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/org/schabi/newpipe/RouterActivity.java
View File

@ -293,8 +293,8 @@ public class RouterActivity extends AppCompatActivity {
selectedChoice.equals(getString(R.string.background_player_key)); selectedChoice.equals(getString(R.string.background_player_key));
if (currentLinkType != LinkType.STREAM if (currentLinkType != LinkType.STREAM
&& (isExtAudioEnabled && isAudioPlayerSelected && ((isExtAudioEnabled && isAudioPlayerSelected)
|| isExtVideoEnabled && isVideoPlayerSelected) || (isExtVideoEnabled && isVideoPlayerSelected))
) { ) {
Toast.makeText(this, R.string.external_player_unsupported_link_type, Toast.makeText(this, R.string.external_player_unsupported_link_type,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
@ -306,8 +306,8 @@ public class RouterActivity extends AppCompatActivity {
currentService.getServiceInfo().getMediaCapabilities(); currentService.getServiceInfo().getMediaCapabilities();
// Check if the service supports the choice // Check if the service supports the choice
if (isVideoPlayerSelected && capabilities.contains(VIDEO) if ((isVideoPlayerSelected && capabilities.contains(VIDEO))
|| isAudioPlayerSelected && capabilities.contains(AUDIO)) { || (isAudioPlayerSelected && capabilities.contains(AUDIO))) {
handleChoice(selectedChoice); handleChoice(selectedChoice);
} else { } else {
handleChoice(getString(R.string.show_info_key)); handleChoice(getString(R.string.show_info_key));
@ -483,6 +483,7 @@ public class RouterActivity extends AppCompatActivity {
final List<AdapterChoiceItem> returnedItems = new ArrayList<>(); final List<AdapterChoiceItem> returnedItems = new ArrayList<>();
returnedItems.add(showInfo); // Always present returnedItems.add(showInfo); // Always present
final List<StreamingService.ServiceInfo.MediaCapability> capabilities = final List<StreamingService.ServiceInfo.MediaCapability> capabilities =
service.getServiceInfo().getMediaCapabilities(); service.getServiceInfo().getMediaCapabilities();
@ -506,6 +507,8 @@ public class RouterActivity extends AppCompatActivity {
getString(R.string.add_to_playlist), getString(R.string.add_to_playlist),
R.drawable.ic_add)); R.drawable.ic_add));
} else { } else {
// LinkType.NONE is never present because it's filtered out before
// channels and playlist can be played as they contain a list of videos
final SharedPreferences preferences = PreferenceManager final SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(this); .getDefaultSharedPreferences(this);
final boolean isExtVideoEnabled = preferences.getBoolean( final boolean isExtVideoEnabled = preferences.getBoolean(
@ -608,30 +611,28 @@ public class RouterActivity extends AppCompatActivity {
finish(); finish();
} }
// show only "video player" since the details activity will be opened and the
// video will be auto played there.
private boolean canHandleChoiceLikeShowInfo(final String selectedChoiceKey) { private boolean canHandleChoiceLikeShowInfo(final String selectedChoiceKey) {
// "video player" can be handled like "show info" when... if (!selectedChoiceKey.equals(getString(R.string.video_player_key))) {
if (selectedChoiceKey.equals(getString(R.string.video_player_key))) { return false;
// Autoplay is enabled }
// "video player" can be handled like "show info" (because VideoDetailFragment can load
// the stream instead of FetcherService) when...
// ...Autoplay is enabled
if (!PlayerHelper.isAutoplayAllowedByUser(getThemeWrapperContext())) { if (!PlayerHelper.isAutoplayAllowedByUser(getThemeWrapperContext())) {
return false; return false;
} }
final boolean isExtVideoEnabled = PreferenceManager.getDefaultSharedPreferences(this) final boolean isExtVideoEnabled = PreferenceManager.getDefaultSharedPreferences(this)
.getBoolean(getString(R.string.use_external_video_player_key), false); .getBoolean(getString(R.string.use_external_video_player_key), false);
// Ignore it when it's done via an external player // ...it's not done via an external player
if (isExtVideoEnabled) { if (isExtVideoEnabled) {
return false; return false;
} }
// The player is not running or in Video-mode/type // ...the player is not running or in normal Video-mode/type
final MainPlayer.PlayerType playerType = PlayerHolder.getInstance().getType(); final MainPlayer.PlayerType playerType = PlayerHolder.getInstance().getType();
return playerType == null || playerType == MainPlayer.PlayerType.VIDEO; return playerType == null || playerType == MainPlayer.PlayerType.VIDEO;
// Since "show info" would do the exact same thing, use that as a key to let
// VideoDetailFragment load the stream instead of using FetcherService
}
return false;
} }
private void openAddToPlaylistDialog() { private void openAddToPlaylistDialog() {