Merge pull request #3962 from ByteHamster/cleanup-lint

Cleaned up some Lint warnings

3 files changed, 18 insertions, 21 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java
index 1e51380ca..271b31fad 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/GpodderPreferencesFragment.java
@@ -63,11 +63,11 @@ public class GpodderPreferencesFragment extends PreferenceFragmentCompat {
         findPreference(PREF_GPODNET_SETLOGIN_INFORMATION)
                 .setOnPreferenceClickListener(preference -> {
                     AuthenticationDialog dialog = new AuthenticationDialog(activity,
-                            R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(),
+                            R.string.pref_gpodnet_setlogin_information_title, false, GpodnetPreferences.getUsername(),
                             null) {
 
                         @Override
-                        protected void onConfirmed(String username, String password, boolean saveUsernamePassword) {
+                        protected void onConfirmed(String username, String password) {
                             GpodnetPreferences.setPassword(password);
                         }
                     };
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
index 1ca8f63aa..f9015c006 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
@@ -96,8 +96,7 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
     private void setParallelDownloadsText(int downloads) {
         final Resources res = getActivity().getResources();
 
-        String s = Integer.toString(downloads)
-                + res.getString(R.string.parallel_downloads_suffix);
+        String s = downloads + res.getString(R.string.parallel_downloads_suffix);
         findPreference(UserPreferences.PREF_PARALLEL_DOWNLOADS).setSummary(s);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
index c3611d683..0ea8d5b93 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
@@ -8,7 +8,6 @@ import com.google.android.material.snackbar.Snackbar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.PreferenceFragmentCompat;
 import android.widget.ListView;
-import android.widget.Toast;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
@@ -19,7 +18,6 @@ import org.apache.commons.lang3.ArrayUtils;
 import java.util.List;
 
 public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat {
-    private static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -59,26 +57,26 @@ public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat {
 
         findPreference(UserPreferences.PREF_BACK_BUTTON_BEHAVIOR)
                 .setOnPreferenceChangeListener((preference, newValue) -> {
-                    if (newValue.equals("page")) {
-                        final Context context = getActivity();
-                        final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
-                        final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags);
-                        final String[] choice = { UserPreferences.getBackButtonGoToPage() };
+                    if (!newValue.equals("page")) {
+                        return true;
+                    }
+                    final Context context = getActivity();
+                    final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages);
+                    final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags);
+                    final String[] choice = { UserPreferences.getBackButtonGoToPage() };
 
-                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                        builder.setTitle(R.string.back_button_go_to_page_title);
-                        builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags, UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                    builder.setTitle(R.string.back_button_go_to_page_title);
+                    builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags,
+                            UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> {
                             if (i >= 0) {
                                 choice[0] = navTags[i];
                             }
                         });
-                        builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0]));
-                        builder.setNegativeButton(R.string.cancel_label, null);
-                        builder.create().show();
-                        return true;
-                    } else {
-                        return true;
-                    }
+                    builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0]));
+                    builder.setNegativeButton(R.string.cancel_label, null);
+                    builder.create().show();
+                    return true;
                 });
 
         if (Build.VERSION.SDK_INT >= 26) {