Fix lint warnings

3 files changed, 21 insertions, 12 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 7aed4e4a..d34f229f 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -1,7 +1,5 @@
 package de.blinkt.openvpn;
 
-import java.io.IOException;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
@@ -16,13 +14,17 @@ import android.text.InputType;
 import android.text.TextUtils;
 import android.text.method.PasswordTransformationMethod;
 import android.view.View;
-import android.widget.*;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+
+import java.io.IOException;
 
 import de.blinkt.openvpn.activities.LogWindow;
-import de.blinkt.openvpn.core.VpnStatus;
-import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VPNLaunchHelper;
+import de.blinkt.openvpn.core.VpnStatus;
+import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
 
 /**
  * This Activity actually handles two stages of a launcher shortcut's life cycle.
@@ -110,7 +112,7 @@ public class LaunchVPN extends Activity {
 	private void askForPW(final int type) {
 
 		final EditText entry = new EditText(this);
-        final View userpwlayout = getLayoutInflater().inflate(R.layout.userpass, null);
+        final View userpwlayout = getLayoutInflater().inflate(R.layout.userpass, null, false);
 
 		entry.setSingleLine();
 		entry.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 6ef41e1b..03f52e22 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -9,11 +9,9 @@ import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;

 import android.util.Log;

 

-import org.jetbrains.annotations.NotNull;

+import junit.framework.Assert;

 

-import de.blinkt.openvpn.R;

-import de.blinkt.openvpn.VpnProfile;

-import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;

+import org.jetbrains.annotations.NotNull;

 

 import java.io.FileDescriptor;

 import java.io.IOException;

@@ -22,7 +20,16 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

 import java.net.InetSocketAddress;

 import java.net.SocketAddress;

-import java.util.*;

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.LinkedList;

+import java.util.Locale;

+import java.util.Vector;

+

+import de.blinkt.openvpn.BuildConfig;

+import de.blinkt.openvpn.R;

+import de.blinkt.openvpn.VpnProfile;

+import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;

 

 public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {

 

@@ -391,7 +398,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
             */

 

             if(routeparts.length==5) {

-                assert(routeparts[3].equals("dev"));

+                if (BuildConfig.DEBUG) Assert.assertEquals("dev", routeparts[3]);

                 mOpenVPNService.addRoute(routeparts[0], routeparts[1], routeparts[2], routeparts[4]);

             }  else if (routeparts.length >= 3) {

                 mOpenVPNService.addRoute(routeparts[0], routeparts[1], routeparts[2], null);

diff --git a/main/src/main/res/drawable-hdpi/icon.png b/main/src/main/res/drawable-hdpi/icon.png
index 69704758..d772f454 100644
--- a/main/src/main/res/drawable-hdpi/icon.png
+++ b/main/src/main/res/drawable-hdpi/icon.png