Merge pull request #3962 from ByteHamster/cleanup-lint

Cleaned up some Lint warnings

2 files changed, 10 insertions, 19 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
index 073f7b550..fb2f92742 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java
@@ -3,7 +3,6 @@ package de.danoeh.antennapod.dialog;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import de.danoeh.antennapod.R;
 
@@ -13,8 +12,7 @@ import de.danoeh.antennapod.R;
 public abstract class AuthenticationDialog extends AlertDialog.Builder {
 
     public AuthenticationDialog(Context context, int titleRes, boolean enableUsernameField,
-                                boolean showSaveCredentialsCheckbox, String usernameInitialValue,
-                                String passwordInitialValue) {
+                                String usernameInitialValue, String passwordInitialValue) {
         super(context);
         setTitle(titleRes);
         View rootView = View.inflate(context, R.layout.authentication_dialog, null);
@@ -22,14 +20,8 @@ public abstract class AuthenticationDialog extends AlertDialog.Builder {
 
         final EditText etxtUsername = rootView.findViewById(R.id.etxtUsername);
         final EditText etxtPassword = rootView.findViewById(R.id.etxtPassword);
-        final CheckBox saveUsernamePassword = rootView.findViewById(R.id.chkSaveUsernamePassword);
 
         etxtUsername.setEnabled(enableUsernameField);
-        if (showSaveCredentialsCheckbox) {
-            saveUsernamePassword.setVisibility(View.VISIBLE);
-        } else {
-            saveUsernamePassword.setVisibility(View.GONE);
-        }
         if (usernameInitialValue != null) {
             etxtUsername.setText(usernameInitialValue);
         }
@@ -39,13 +31,12 @@ public abstract class AuthenticationDialog extends AlertDialog.Builder {
         setOnCancelListener(dialog -> onCancelled());
         setNegativeButton(R.string.cancel_label, null);
         setPositiveButton(R.string.confirm_label, (dialog, which)
-                -> onConfirmed(etxtUsername.getText().toString(), etxtPassword.getText().toString(),
-                        showSaveCredentialsCheckbox && saveUsernamePassword.isChecked()));
+                -> onConfirmed(etxtUsername.getText().toString(), etxtPassword.getText().toString()));
     }
 
     protected void onCancelled() {
 
     }
 
-    protected abstract void onConfirmed(String username, String password, boolean saveUsernamePassword);
+    protected abstract void onConfirmed(String username, String password);
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
index 11256f2de..0c25e3e9f 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -84,16 +84,16 @@ public class ProxyDialog {
                 String host = etHost.getText().toString();
                 String port = etPort.getText().toString();
                 String username = etUsername.getText().toString();
-                if(TextUtils.isEmpty(username)) {
+                if (TextUtils.isEmpty(username)) {
                     username = null;
                 }
                 String password = etPassword.getText().toString();
-                if(TextUtils.isEmpty(password)) {
+                if (TextUtils.isEmpty(password)) {
                     password = null;
                 }
                 int portValue = 0;
-                if(!TextUtils.isEmpty(port)) {
-                    portValue = Integer.valueOf(port);
+                if (!TextUtils.isEmpty(port)) {
+                    portValue = Integer.parseInt(port);
                 }
                 if (Proxy.Type.valueOf(type) == Proxy.Type.SOCKS) {
                     proxy = ProxyConfig.socks(host, portValue, username, password);
@@ -257,8 +257,8 @@ public class ProxyDialog {
             String username = etUsername.getText().toString();
             String password = etPassword.getText().toString();
             int portValue = 8080;
-            if(!TextUtils.isEmpty(port)) {
-                portValue = Integer.valueOf(port);
+            if (!TextUtils.isEmpty(port)) {
+                portValue = Integer.parseInt(port);
             }
             SocketAddress address = InetSocketAddress.createUnresolved(host, portValue);
             Proxy.Type proxyType = Proxy.Type.valueOf(type.toUpperCase());
@@ -268,7 +268,7 @@ public class ProxyDialog {
                     .proxy(proxy);
             builder.interceptors().clear();
             OkHttpClient client = builder.build();
-            if(!TextUtils.isEmpty(username)) {
+            if (!TextUtils.isEmpty(username)) {
                 String credentials = Credentials.basic(username, password);
                 client.interceptors().add(chain -> {
                     Request request = chain.request().newBuilder()