Automatic code cleanup

Author: morckx

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/UINotificationTests.java

@@ -70,8 +70,8 @@ private void launchPlayingNotification() {
     }
 
     private static class UIObjectWaiterCondition implements ConditionWatcher.Condition {
-        private UiDevice uiDevice;
-        private BySelector bySelector;
+        private final UiDevice uiDevice;
+        private final BySelector bySelector;
 
         public UIObjectWaiterCondition(UiDevice uiDevice, BySelector bySelector) {
             this.uiDevice = uiDevice;

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/OrientationChangeAction.java

@@ -68,8 +68,7 @@ public void perform(UiController uiController, View view) {
 
         Activity activity = getActivity(view.getContext());
 
-        if (activity == null && view instanceof ViewGroup) {
-            ViewGroup v = (ViewGroup) view;
+        if (activity == null && view instanceof ViewGroup v) {
             int c = v.getChildCount();
             for (int i = 0; i < c && activity == null; ++i) {
                 activity = getActivity(v.getChildAt(i).getContext());

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/RecyclerRecyclingMatcher.java

@@ -11,7 +11,7 @@
 import org.hamcrest.TypeSafeMatcher;
 
 public class RecyclerRecyclingMatcher {
-    private static float MAX_SIZE_K = 1.25f;
+    private static final float MAX_SIZE_K = 1.25f;
 
     public static Matcher<View> recyclerRecycles() {
         return new TypeSafeMatcher<View>(RecyclerView.class) {

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/ScrollToRecyclerItemAction.java

@@ -13,7 +13,7 @@
 public class ScrollToRecyclerItemAction implements ViewAction {
     private static final int VIEW_DISPLAY_PERCENTAGE = 50;
 
-    private int itemIdx;
+    private final int itemIdx;
 
     public static ScrollToRecyclerItemAction scrollToRecyclerItem(int itemIdx) {
         return new ScrollToRecyclerItemAction(itemIdx);

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/conditionwatcher/IsMusicPlayingCondition.java

@@ -8,7 +8,7 @@
 import javax.annotation.Nonnull;
 
 public class IsMusicPlayingCondition implements ConditionWatcher.Condition {
-    private boolean expectPlaying;
+    private final boolean expectPlaying;
 
     public IsMusicPlayingCondition(boolean expectPlaying) {
         this.expectPlaying = expectPlaying;

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/conditionwatcher/ViewMatchWaiter.java

@@ -16,8 +16,8 @@
  * Inspired by https://github.com/AzimoLabs/ConditionWatcher/issues/7
  */
 public class ViewMatchWaiter {
-    private Matcher<View> viewMatcher;
-    private ConditionWatcher.Policy policy;
+    private final Matcher<View> viewMatcher;
+    private final ConditionWatcher.Policy policy;
 
     public ViewMatchWaiter(@Nonnull Matcher<View> viewMatcher) {
         this.viewMatcher = viewMatcher;

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/http/HttpToMockInterceptor.java

@@ -13,7 +13,7 @@
 
 public class HttpToMockInterceptor implements Interceptor {
 
-    private InetSocketAddress address;
+    private final InetSocketAddress address;
 
     public HttpToMockInterceptor(MockWebServer mockWebServer) {
         address = new InetSocketAddress(mockWebServer.getHostName(), mockWebServer.getPort());

app/src/androidTest/java/net/programmierecke/radiodroid2/tests/utils/http/MockHttpDispatcher.java

@@ -78,7 +78,7 @@ public MockResponse dispatch(RecordedRequest request) throws InterruptedExceptio
             return IcyStreamGenerator.generateIcyStream(getClass(), "/test.mp3");
         }
 
-        Log.w("MockHttpDispatcher", String.format("No handling of \"%s\"", request.toString()));
+        Log.w("MockHttpDispatcher", String.format("No handling of \"%s\"", request));
 
         return new MockResponse().setResponseCode(404);
     }

app/src/main/java/net/programmierecke/radiodroid2/ActivityMain.java

@@ -495,7 +495,7 @@ protected void onNewIntent(Intent intent) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode,
-                                           String permissions[], int[] grantResults) {
+                                           String[] permissions, int[] grantResults) {
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "on request permissions result:" + requestCode);
         }
@@ -519,7 +519,6 @@ public void onRequestPermissionsResult(int requestCode,
                     Log.w(TAG,"permission not granted -> simple save");
                     SaveFavouritesSimple();
                 }
-                return;
             }
         }
     }
@@ -638,7 +637,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.menu_main, menu);
 
-        final Toolbar myToolbar = (Toolbar) findViewById(R.id.my_awesome_toolbar);
+        final Toolbar myToolbar = findViewById(R.id.my_awesome_toolbar);
         menuItemSleepTimer = menu.findItem(R.id.action_set_sleep_timer);
         menuItemSearch = menu.findItem(R.id.action_search);
         menuItemDelete = menu.findItem(R.id.action_delete);
@@ -1159,7 +1158,7 @@ public void onReceive(Context context, Intent intent) {
                             }
                             break;
                         default:
-                            Log.e(TAG, String.format("broadcastReceiver unexpected PlayerType '%s'", playerType.toString()));
+                            Log.e(TAG, String.format("broadcastReceiver unexpected PlayerType '%s'", playerType));
                     }
                 } else if (intent.getAction().equals(PlayerService.PLAYER_SERVICE_STATE_CHANGE)) {
                     if (PlayerServiceUtil.isPlaying()) {
@@ -1191,8 +1190,8 @@ private void changeTimer() {
         seekDialog.setTitle(R.string.sleep_timer_title);
         seekDialog.setView(seekView);
 
-        final TextView seekTextView = (TextView) seekView.findViewById(R.id.timerTextView);
-        final SeekBar seekBar = (SeekBar) seekView.findViewById(R.id.timerSeekBar);
+        final TextView seekTextView = seekView.findViewById(R.id.timerTextView);
+        final SeekBar seekBar = seekView.findViewById(R.id.timerSeekBar);
         seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -1246,7 +1245,7 @@ private void selectMPDServer() {
     }
 
     public final Toolbar getToolbar() {
-        return (Toolbar) findViewById(R.id.my_awesome_toolbar);
+        return findViewById(R.id.my_awesome_toolbar);
     }
 
     @Override
@@ -1388,9 +1387,8 @@ private void focusLastNavigationItem() {
         // Find the RecyclerView inside the NavigationView
         for (int i = 0; i < mNavigationView.getChildCount(); i++) {
             View child = mNavigationView.getChildAt(i);
-            if (child instanceof androidx.recyclerview.widget.RecyclerView) {
-                androidx.recyclerview.widget.RecyclerView recyclerView = (androidx.recyclerview.widget.RecyclerView) child;
-                
+            if (child instanceof androidx.recyclerview.widget.RecyclerView recyclerView) {
+
                 if (recyclerView.getAdapter() != null) {
                     int lastPosition = recyclerView.getAdapter().getItemCount() - 1;
                     if (lastPosition >= 0) {
@@ -1493,9 +1491,8 @@ private void focusNavigationMenuItemByFragment(int menuItemId) {
         // Find the RecyclerView inside the NavigationView
         for (int i = 0; i < mNavigationView.getChildCount(); i++) {
             View child = mNavigationView.getChildAt(i);
-            if (child instanceof androidx.recyclerview.widget.RecyclerView) {
-                androidx.recyclerview.widget.RecyclerView recyclerView = (androidx.recyclerview.widget.RecyclerView) child;
-                
+            if (child instanceof androidx.recyclerview.widget.RecyclerView recyclerView) {
+
                 // Find the position of our menu item in the navigation menu
                 Menu menu = mNavigationView.getMenu();
                 int targetPosition = -1;

app/src/main/java/net/programmierecke/radiodroid2/ApplicationSelectorDialog.java

@@ -35,7 +35,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         List<ResolveInfo> resolveInfos = pm.queryIntentActivities(mainIntent, PackageManager.MATCH_DEFAULT_ONLY);
         for(ResolveInfo info : resolveInfos) {
             ApplicationInfo applicationInfo = info.activityInfo.applicationInfo;
-            if(BuildConfig.DEBUG) { Log.d("UUU", ""+applicationInfo.packageName + " -- "+ info.activityInfo.name+ " -> "); }
+            if(BuildConfig.DEBUG) { Log.d("UUU", applicationInfo.packageName + " -- "+ info.activityInfo.name+ " -> "); }
             arrayAdapter.add(""+pm.getApplicationLabel(applicationInfo));
             listInfos.add(info.activityInfo);
         }