diff options
author | Parménides GV <parmegv@sdf.org> | 2014-08-02 10:52:28 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-08-02 10:52:28 +0200 |
commit | 4aedacdf92ab2fc08a1e39618761bc1eb96427d6 (patch) | |
tree | f000311e97598ab3fc42e2bea23e6cb342ad166c /app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | |
parent | b28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff) | |
parent | 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (diff) |
Merge branch 'bug/There-are-two-different-notifications-#5794' into develop
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/LaunchVPN.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java index a39e780a..3f80eef0 100644 --- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -4,8 +4,6 @@ import se.leap.bitmaskclient.R; import se.leap.bitmaskclient.R; -import java.io.IOException; - import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; @@ -20,13 +18,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. @@ -111,7 +113,6 @@ public class LaunchVPN extends Activity { } } - @Override protected void onActivityResult (int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); |