PlayerHelper: fix sonar errors

TeamNewPipe · Feb 12, 2025 · 756d923 · 756d923
1 parent 27c3026
commit 756d923
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -91,8 +91,8 @@ public void onAudioFocusChange(final int focusChange) {
             case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
                 onAudioFocusLossCanDuck();
                 break;
-            case AudioManager.AUDIOFOCUS_LOSS:
-            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+            case AudioManager.AUDIOFOCUS_LOSS,
+                 AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
                 onAudioFocusLoss();
                 break;
         }

diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -55,14 +55,13 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 public final class PlayerHelper {
     private static final NumberFormat SPEED_FORMATTER = new DecimalFormat("0.##x");
     private static final NumberFormat PITCH_FORMATTER = new DecimalFormat("##%");
     private static final long MEGABYTE = 1024 * 1024L;
-    private static final Logger logger = Logger.getLogger(getClass().getName());
+    private static final Logger LOGGER = Logger.getLogger(getClass().getName());
 
     @Retention(SOURCE)
     @IntDef({AUTOPLAY_TYPE_ALWAYS, AUTOPLAY_TYPE_WIFI,
@@ -189,8 +188,8 @@ public static PlayQueue autoQueueOf(@NonNull final StreamInfo info,
             return null;
         }
 
-        if (relatedItems.get(0) instanceof StreamInfoItem firstItem &&
-                !urls.contains(firstItem.getUrl())) {
+        if (relatedItems.get(0) instanceof StreamInfoItem firstItem
+                && !urls.contains(firstItem.getUrl())) {
             return getAutoQueuedSinglePlayQueue(firstItem);
         }
 
@@ -200,8 +199,8 @@ public static PlayQueue autoQueueOf(@NonNull final StreamInfo info,
                 .collect(Collectors.toList());
 
         Collections.shuffle(autoQueueItems);
-        return autoQueueItems.isEmpty() ? null :
-                getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
+        return autoQueueItems.isEmpty() ? null
+                : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -502,7 +501,7 @@ public static int retrieveSeekDurationFromPreferences(final Player player) {
         try {
             return Integer.parseInt(seekDurationString);
         } catch (final NumberFormatException e) {
-            logger.info("Error during the conversion of the seek duration. : " + e.getMessage());
+            LOGGER.info("Error during the conversion of the seek duration. : " + e.getMessage());
             return Integer.parseInt(defaultValue);
         }
     }

diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
@@ -226,8 +226,7 @@ private void onPlayQueueChanged(final PlayQueueEvent event) {
 
         // Event specific action
         switch (event.type()) {
-            case INIT:
-            case ERROR:
+            case INIT, ERROR:
                 maybeBlock();
             case APPEND:
                 populateSources();
@@ -257,18 +256,18 @@ private void onPlayQueueChanged(final PlayQueueEvent event) {
 
         // Loading and Syncing
         switch (event.type()) {
-            case INIT: case REORDER: case ERROR: case SELECT:
+            case INIT, REORDER, ERROR, SELECT:
                 loadImmediate(); // low frequency, critical events
                 break;
-            case APPEND: case REMOVE: case MOVE: case RECOVERY:
+            case APPEND, REMOVE, MOVE, RECOVERY:
             default:
                 loadDebounced(); // high frequency or noncritical events
                 break;
         }
 
         // update ui and notification
         switch (event.type()) {
-            case APPEND: case REMOVE: case MOVE: case REORDER:
+            case APPEND, REMOVE, MOVE, REORDER:
                 playbackListener.onPlayQueueEdited();
         }