Cleanup unnecessary usages of toString()

feiser2016 · Jan 17, 2023 · 0ae75c5 · 0ae75c5
1 parent e40c818
commit 0ae75c5
Show file tree

Hide file tree

Showing 28 changed files with 111 additions and 153 deletions.
diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/OverscanFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/OverscanFragment.java
@@ -67,7 +67,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }
@@ -166,14 +166,11 @@ public void onStop() {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case android.R.id.home:
-            // Override default Android "up" behavior to instead mimic the back button
+        if (item.getItemId() == android.R.id.home) {// Override default Android "up" behavior to instead mimic the back button
             this.onBackPressed();
             return true;
-        default:
-            return super.onOptionsItemSelected(item);
         }
+        return super.onOptionsItemSelected(item);
     }
 
     public void onBackPressed() {
@@ -253,7 +250,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
      * A preference value change listener that updates the preference's summary
      * to reflect its new value.
      */
-    private static Preference.OnPreferenceChangeListener opcl = (preference, value) -> {
+    private static final Preference.OnPreferenceChangeListener opcl = (preference, value) -> {
         String stringValue = value.toString();
 
         // Damage control if user inputs an empty value

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileEditFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileEditFragment.java
@@ -97,7 +97,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }
@@ -178,9 +178,9 @@ public void onCreate(Bundle savedInstanceState) {
 
             if(prefMain.getBoolean("expert_mode", false)) {
                 if("reset".equals(prefSaved.getString("size", "reset"))) {
-                    editor.putString("size", Integer.toString(prefMain.getInt("width", 0))
+                    editor.putString("size", prefMain.getInt("width", 0)
                             + "x"
-                            + Integer.toString(prefMain.getInt("height", 0)));
+                            + prefMain.getInt("height", 0));
 
                     editor.putBoolean("size-reset", true);
                 } else
@@ -195,9 +195,9 @@ public void onCreate(Bundle savedInstanceState) {
                 if(prefSaved.getBoolean("size-reset", false)) {
                     editor.remove("size-reset");
 
-                    String nativeRes = Integer.toString(prefMain.getInt("width", 0))
+                    String nativeRes = prefMain.getInt("width", 0)
                             + "x"
-                            + Integer.toString(prefMain.getInt("height", 0));
+                            + prefMain.getInt("height", 0);
 
                     if(nativeRes.equals(prefSaved.getString("size", "reset")))
                         editor.putString("size", "reset");

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileListFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileListFragment.java
@@ -117,7 +117,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                                          + " must implement Listener");
         }
     }
@@ -264,17 +264,11 @@ private void listProfiles() {
                 if("quick_actions".equals(prefCurrent.getString("filename", "0"))) {
                     SharedPreferences prefSaved = listener.getPrefQuickActions();
                     for(int i = 0; i < numOfFiles; i++) {
-                        if(profileList[0][i].equals(prefSaved.getString("original_filename", "0")))
-                            listView.setItemChecked(i, true);
-                        else
-                            listView.setItemChecked(i, false);
+                        listView.setItemChecked(i, profileList[0][i].equals(prefSaved.getString("original_filename", "0")));
                     }
                 } else {
                     for(int i = 0; i < numOfFiles; i++) {
-                        if(profileList[0][i].equals(prefCurrent.getString("filename", "0")))
-                            listView.setItemChecked(i, true);
-                        else
-                            listView.setItemChecked(i, false);
+                        listView.setItemChecked(i, profileList[0][i].equals(prefCurrent.getString("filename", "0")));
                     }
                 }
 
@@ -292,17 +286,11 @@ private void listProfiles() {
                 if("quick_actions".equals(prefCurrent.getString("filename", "0"))) {
                     SharedPreferences prefSaved = listener.getPrefQuickActions();
                     for(int i = 0; i < numOfFiles; i++) {
-                        if(profileList[0][i].equals(prefSaved.getString("original_filename", "0")))
-                            listView.setItemChecked(i, true);
-                        else
-                            listView.setItemChecked(i, false);
+                        listView.setItemChecked(i, profileList[0][i].equals(prefSaved.getString("original_filename", "0")));
                     }
                 } else {
                     for(int i = 0; i < numOfFiles; i++) {
-                        if(profileList[0][i].equals(prefCurrent.getString("filename", "0")))
-                            listView.setItemChecked(i, true);
-                        else
-                            listView.setItemChecked(i, false);
+                        listView.setItemChecked(i, profileList[0][i].equals(prefCurrent.getString("filename", "0")));
                     }
                 }
 
@@ -319,17 +307,11 @@ private void listProfiles() {
             if("quick_actions".equals(prefCurrent.getString("filename", "0"))) {
                 SharedPreferences prefSaved = listener.getPrefQuickActions();
                 for(int i = 0; i < numOfFiles; i++) {
-                    if(profileList[0][i].equals(prefSaved.getString("original_filename", "0")))
-                        listView.setItemChecked(i, true);
-                    else
-                        listView.setItemChecked(i, false);
+                    listView.setItemChecked(i, profileList[0][i].equals(prefSaved.getString("original_filename", "0")));
                 }
             } else {
                 for(int i = 0; i < numOfFiles; i++) {
-                    if(profileList[0][i].equals(prefCurrent.getString("filename", "0")))
-                        listView.setItemChecked(i, true);
-                    else
-                        listView.setItemChecked(i, false);
+                    listView.setItemChecked(i, profileList[0][i].equals(prefCurrent.getString("filename", "0")));
                 }
             }
 

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileViewFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/ProfileViewFragment.java
@@ -75,7 +75,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }
@@ -171,10 +171,8 @@ private void showUI() {
         generateProfileSettings(prefSaved.getBoolean("navbar", false), R.string.profile_view_navbar);
         generateProfileSettings(prefSaved.getBoolean("freeform", false), R.string.profile_view_freeform);
 
-        switch(prefSaved.getString("hdmi_rotation", "landscape")) {
-            case "portrait":
-                generateProfileSettings(true, R.string.profile_view_hdmi_output);
-                break;
+        if ("portrait".equals(prefSaved.getString("hdmi_rotation", "landscape"))) {
+            generateProfileSettings(true, R.string.profile_view_hdmi_output);
         }
 
         if(U.canEnableOverscan())

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/SettingsFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/SettingsFragment.java
@@ -70,7 +70,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/AboutDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/AboutDialogFragment.java
@@ -58,7 +58,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/...src/main/java/com/farmerbb/secondscreen/fragment/dialog/AndroidUpgradeDialogFragment.java b/...src/main/java/com/farmerbb/secondscreen/fragment/dialog/AndroidUpgradeDialogFragment.java
@@ -50,7 +50,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/BusyboxDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/BusyboxDialogFragment.java
@@ -49,7 +49,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/DeleteDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/DeleteDialogFragment.java
@@ -47,7 +47,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/ExpertModeDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/ExpertModeDialogFragment.java
@@ -52,7 +52,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/...src/main/java/com/farmerbb/secondscreen/fragment/dialog/ExpertModeSizeDialogFragment.java b/...src/main/java/com/farmerbb/secondscreen/fragment/dialog/ExpertModeSizeDialogFragment.java
@@ -59,7 +59,7 @@ public void onAttach(Activity activity) {
                 listener = (Listener) activity;
             } catch (ClassCastException e) {
                 // The activity doesn't implement the interface, throw exception
-                throw new ClassCastException(activity.toString()
+                throw new ClassCastException(activity
                                              + " must implement Listener");
             }
         }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/FirstLoadDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/FirstLoadDialogFragment.java
@@ -55,7 +55,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/FirstRunDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/FirstRunDialogFragment.java
@@ -55,7 +55,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/KeepOverscanDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/KeepOverscanDialogFragment.java
@@ -50,7 +50,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                                          + " must implement Listener");
         }
     }

diff --git a/...c/main/java/com/farmerbb/secondscreen/fragment/dialog/MultipleVersionsDialogFragment.java b/...c/main/java/com/farmerbb/secondscreen/fragment/dialog/MultipleVersionsDialogFragment.java
@@ -52,7 +52,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                                          + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/NewDeviceDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/NewDeviceDialogFragment.java
@@ -51,7 +51,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/NewProfileDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/NewProfileDialogFragment.java
@@ -62,7 +62,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/ReloadProfileDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/ReloadProfileDialogFragment.java
@@ -50,7 +50,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/SafeModeDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/SafeModeDialogFragment.java
@@ -52,7 +52,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/...n/java/com/farmerbb/secondscreen/fragment/dialog/SystemAlertPermissionDialogFragment.java b/...n/java/com/farmerbb/secondscreen/fragment/dialog/SystemAlertPermissionDialogFragment.java
@@ -47,7 +47,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                     + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/UiRefreshDialogFragment.java b/app/src/main/java/com/farmerbb/secondscreen/fragment/dialog/UiRefreshDialogFragment.java
@@ -49,7 +49,7 @@ public void onAttach(Activity activity) {
             listener = (Listener) activity;
         } catch (ClassCastException e) {
             // The activity doesn't implement the interface, throw exception
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(activity
                                          + " must implement Listener");
         }
     }

diff --git a/app/src/main/java/com/farmerbb/secondscreen/service/BootService.java b/app/src/main/java/com/farmerbb/secondscreen/service/BootService.java
@@ -60,7 +60,7 @@ protected void onHandleIntent(Intent intent) {
         Arrays.fill(su, "");
 
         if("auto-rotate".equals(prefCurrent.getString("rotation_lock_new", "do-nothing"))) {
-            su[rotationCommand] = U.rotationCommand + Integer.toString(Intent.EXTRA_DOCK_STATE_DESK);
+            su[rotationCommand] = U.rotationCommand + Intent.EXTRA_DOCK_STATE_DESK;
             if(Settings.Secure.getInt(getContentResolver(), "screensaver_enabled", 0) == 1
                     && Settings.Secure.getInt(getContentResolver(), "screensaver_activate_on_dock", 0) == 1) {
                 su[rotationPreCommand] = U.rotationPrePostCommands + "0";