Skip to content

Commit c37db85

Browse files
committed
VideoDetailFragment: apply more IDE suggestions
1 parent 4d6e1a4 commit c37db85

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
@@ -438,18 +438,15 @@ public void onDestroyView() {
438438
@Override
439439
public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
440440
super.onActivityResult(requestCode, resultCode, data);
441-
switch (requestCode) {
442-
case ReCaptchaActivity.RECAPTCHA_REQUEST:
443-
if (resultCode == Activity.RESULT_OK) {
444-
NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
445-
serviceId, url, title, null, false);
446-
} else {
447-
Log.e(TAG, "ReCaptcha failed");
448-
}
449-
break;
450-
default:
451-
Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
452-
break;
441+
if (requestCode == ReCaptchaActivity.RECAPTCHA_REQUEST) {
442+
if (resultCode == Activity.RESULT_OK) {
443+
NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
444+
serviceId, url, title, null, false);
445+
} else {
446+
Log.e(TAG, "ReCaptcha failed");
447+
}
448+
} else {
449+
Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
453450
}
454451
}
455452

@@ -1138,7 +1135,7 @@ private void openNormalBackgroundPlayer(final boolean append) {
11381135
}
11391136

11401137
private void openMainPlayer() {
1141-
if (!isPlayerServiceAvailable()) {
1138+
if (noPlayerServiceAvailable()) {
11421139
playerHolder.startService(autoPlayEnabled, this);
11431140
return;
11441141
}
@@ -1163,7 +1160,7 @@ private void openMainPlayer() {
11631160
*/
11641161
private void hideMainPlayerOnLoadingNewStream() {
11651162
final var root = getRoot();
1166-
if (!isPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
1163+
if (noPlayerServiceAvailable() || root.isEmpty() || !player.videoPlayerSelected()) {
11671164
return;
11681165
}
11691166

@@ -1347,21 +1344,21 @@ private void setInitialData(final int newServiceId,
13471344
this.playQueue = newPlayQueue;
13481345
}
13491346

1350-
private void setErrorImage(final int imageResource) {
1347+
private void setErrorImage() {
13511348
if (binding == null || activity == null) {
13521349
return;
13531350
}
13541351

13551352
binding.detailThumbnailImageView.setImageDrawable(
1356-
AppCompatResources.getDrawable(requireContext(), imageResource));
1353+
AppCompatResources.getDrawable(requireContext(), R.drawable.not_available_monkey));
13571354
animate(binding.detailThumbnailImageView, false, 0, AnimationType.ALPHA,
13581355
0, () -> animate(binding.detailThumbnailImageView, true, 500));
13591356
}
13601357

13611358
@Override
13621359
public void handleError() {
13631360
super.handleError();
1364-
setErrorImage(R.drawable.not_available_monkey);
1361+
setErrorImage();
13651362

13661363
if (binding.relatedItemsLayout != null) { // hide related streams for tablets
13671364
binding.relatedItemsLayout.setVisibility(View.INVISIBLE);
@@ -1776,16 +1773,14 @@ public void onPlaybackUpdate(final int state,
17761773
final PlaybackParameters parameters) {
17771774
setOverlayPlayPauseImage(player != null && player.isPlaying());
17781775

1779-
switch (state) {
1780-
case Player.STATE_PLAYING:
1781-
if (binding.positionView.getAlpha() != 1.0f
1782-
&& player.getPlayQueue() != null
1783-
&& player.getPlayQueue().getItem() != null
1784-
&& player.getPlayQueue().getItem().getUrl().equals(url)) {
1785-
animate(binding.positionView, true, 100);
1786-
animate(binding.detailPositionView, true, 100);
1787-
}
1788-
break;
1776+
if (state == Player.STATE_PLAYING) {
1777+
if (binding.positionView.getAlpha() != 1.0f
1778+
&& player.getPlayQueue() != null
1779+
&& player.getPlayQueue().getItem() != null
1780+
&& player.getPlayQueue().getItem().getUrl().equals(url)) {
1781+
animate(binding.positionView, true, 100);
1782+
animate(binding.detailPositionView, true, 100);
1783+
}
17891784
}
17901785
}
17911786

@@ -2444,8 +2439,8 @@ boolean isPlayerAvailable() {
24442439
return player != null;
24452440
}
24462441

2447-
boolean isPlayerServiceAvailable() {
2448-
return playerService != null;
2442+
boolean noPlayerServiceAvailable() {
2443+
return playerService == null;
24492444
}
24502445

24512446
boolean isPlayerAndPlayerServiceAvailable() {

0 commit comments

Comments
 (0)