Skip to content

Commit 44cb912

Browse files
committed
VideoDetailFragment: apply more IDE suggestions
1 parent 969f59a commit 44cb912

1 file changed

Lines changed: 24 additions & 29 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -429,18 +429,15 @@ public void onDestroyView() {
429429
@Override
430430
public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
431431
super.onActivityResult(requestCode, resultCode, data);
432-
switch (requestCode) {
433-
case ReCaptchaActivity.RECAPTCHA_REQUEST:
434-
if (resultCode == Activity.RESULT_OK) {
435-
NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
436-
serviceId, url, title, null, false);
437-
} else {
438-
Log.e(TAG, "ReCaptcha failed");
439-
}
440-
break;
441-
default:
442-
Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
443-
break;
432+
if (requestCode == ReCaptchaActivity.RECAPTCHA_REQUEST) {
433+
if (resultCode == Activity.RESULT_OK) {
434+
NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
435+
serviceId, url, title, null, false);
436+
} else {
437+
Log.e(TAG, "ReCaptcha failed");
438+
}
439+
} else {
440+
Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
444441
}
445442
}
446443

@@ -1129,7 +1126,7 @@ private void openNormalBackgroundPlayer(final boolean append) {
11291126
}
11301127

11311128
private void openMainPlayer() {
1132-
if (!isPlayerServiceAvailable()) {
1129+
if (noPlayerServiceAvailable()) {
11331130
playerHolder.startService(autoPlayEnabled, this, this);
11341131
return;
11351132
}
@@ -1154,7 +1151,7 @@ private void openMainPlayer() {
11541151
*/
11551152
private void hideMainPlayerOnLoadingNewStream() {
11561153
final var root = getRoot();
1157-
if (!isPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
1154+
if (noPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
11581155
return;
11591156
}
11601157

@@ -1338,21 +1335,21 @@ private void setInitialData(final int newServiceId,
13381335
this.playQueue = newPlayQueue;
13391336
}
13401337

1341-
private void setErrorImage(final int imageResource) {
1338+
private void setErrorImage() {
13421339
if (binding == null || activity == null) {
13431340
return;
13441341
}
13451342

13461343
binding.detailThumbnailImageView.setImageDrawable(
1347-
AppCompatResources.getDrawable(requireContext(), imageResource));
1344+
AppCompatResources.getDrawable(requireContext(), R.drawable.not_available_monkey));
13481345
animate(binding.detailThumbnailImageView, false, 0, AnimationType.ALPHA,
13491346
0, () -> animate(binding.detailThumbnailImageView, true, 500));
13501347
}
13511348

13521349
@Override
13531350
public void handleError() {
13541351
super.handleError();
1355-
setErrorImage(R.drawable.not_available_monkey);
1352+
setErrorImage();
13561353

13571354
if (binding.relatedItemsLayout != null) { // hide related streams for tablets
13581355
binding.relatedItemsLayout.setVisibility(View.INVISIBLE);
@@ -1769,16 +1766,14 @@ public void onPlaybackUpdate(final int state,
17691766
final PlaybackParameters parameters) {
17701767
setOverlayPlayPauseImage(player != null && player.isPlaying());
17711768

1772-
switch (state) {
1773-
case Player.STATE_PLAYING:
1774-
if (binding.positionView.getAlpha() != 1.0f
1775-
&& player.getPlayQueue() != null
1776-
&& player.getPlayQueue().getItem() != null
1777-
&& player.getPlayQueue().getItem().getUrl().equals(url)) {
1778-
animate(binding.positionView, true, 100);
1779-
animate(binding.detailPositionView, true, 100);
1780-
}
1781-
break;
1769+
if (state == Player.STATE_PLAYING) {
1770+
if (binding.positionView.getAlpha() != 1.0f
1771+
&& player.getPlayQueue() != null
1772+
&& player.getPlayQueue().getItem() != null
1773+
&& player.getPlayQueue().getItem().getUrl().equals(url)) {
1774+
animate(binding.positionView, true, 100);
1775+
animate(binding.detailPositionView, true, 100);
1776+
}
17821777
}
17831778
}
17841779

@@ -2434,8 +2429,8 @@ boolean isPlayerAvailable() {
24342429
return player != null;
24352430
}
24362431

2437-
boolean isPlayerServiceAvailable() {
2438-
return playerService != null;
2432+
boolean noPlayerServiceAvailable() {
2433+
return playerService == null;
24392434
}
24402435

24412436
boolean isPlayerAndPlayerServiceAvailable() {

0 commit comments

Comments
 (0)