Remove ics-openvpn dependencies in files needed by Bitmask

4 files changed, 61 insertions, 36 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index df19565c..77a78333 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -170,6 +170,7 @@ public class LaunchVPN extends Activity {
 
                 });
         dialog.setNegativeButton(android.R.string.cancel,
+
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -178,9 +179,31 @@ public class LaunchVPN extends Activity {
                         finish();
                     }
                 });
+		dialog.create().show();
 
-        dialog.create().show();
+	}
+    @Override
+    protected void onActivityResult (int requestCode, int resultCode, Intent data) {
+	super.onActivityResult(requestCode, resultCode, data);
+
+	if(requestCode==START_VPN_PROFILE) {
+	    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+	    boolean showLogWindow = prefs.getBoolean("showlogwindow", true);
+
+	    if(!mhideLog && showLogWindow)
+		showLogWindow();
+	    new startOpenVpnThread().start();
+	} else if (resultCode == Activity.RESULT_CANCELED) {
+	    // User does not want us to start, so we just vanish
+	    VpnStatus.updateStateString("USER_VPN_PERMISSION_CANCELLED", "", R.string.state_user_vpn_permission_cancelled,
+					ConnectionStatus.LEVEL_NOTCONNECTED);
+
+	    finish();
+	}
+    }
 
+    void showLogWindow() {
+        dialog.create().show();
     }
 
     @Override
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 536abdc2..b778f4c9 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -47,7 +47,6 @@ import de.blinkt.openvpn.BuildConfig;
 import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.activities.DisconnectVPN;
-import de.blinkt.openvpn.activities.LogWindow;
 import de.blinkt.openvpn.core.VpnStatus.ByteCountListener;
 import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
 import de.blinkt.openvpn.core.VpnStatus.StateListener;
@@ -57,6 +56,8 @@ import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTED;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTING_NO_SERVER_REPLY_YET;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT;
 
+import se.leap.bitmaskclient.Dashboard;
+
 public class OpenVPNService extends VpnService implements StateListener, Callback, ByteCountListener {
     public static final String START_SERVICE = "de.blinkt.openvpn.START_SERVICE";
     public static final String START_SERVICE_STICKY = "de.blinkt.openvpn.START_SERVICE_STICKY";
@@ -282,7 +283,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
 
     PendingIntent getLogPendingIntent() {
         // Let the configure Button show the Log
-        Intent intent = new Intent(getBaseContext(), LogWindow.class);
+        Intent intent = new Intent(getBaseContext(), Dashboard.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         PendingIntent startLW = PendingIntent.getActivity(this, 0, intent, 0);
         intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index 3c68fd87..bd39d55f 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -56,8 +56,6 @@ import de.blinkt.openvpn.LaunchVPN;
 import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.activities.DisconnectVPN;
-import de.blinkt.openvpn.activities.MainActivity;
-import de.blinkt.openvpn.activities.VPNPreferences;
 import de.blinkt.openvpn.core.OpenVPNManagement;
 import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
@@ -69,6 +67,8 @@ import de.blinkt.openvpn.core.VpnStatus.StateListener;
 
 import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount;
 
+import se.leap.bitmaskclient.Dashboard;
+
 public class LogFragment extends ListFragment implements StateListener, SeekBar.OnSeekBarChangeListener, RadioGroup.OnCheckedChangeListener, VpnStatus.ByteCountListener {
     private static final String LOGTIMEFORMAT = "logtimeformat";
     private static final int START_VPN_CONFIG = 0;
@@ -429,34 +429,33 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
             Intent intent = new Intent(getActivity(), DisconnectVPN.class);
             startActivity(intent);
             return true;
-        } else if (item.getItemId() == R.id.send) {
-            ladapter.shareLog();
-        } else if (item.getItemId() == R.id.edit_vpn) {
-            VpnProfile lastConnectedprofile = ProfileManager.getLastConnectedVpn();
-
-            if (lastConnectedprofile != null) {
-                Intent vprefintent = new Intent(getActivity(), VPNPreferences.class)
-                        .putExtra(VpnProfile.EXTRA_PROFILEUUID, lastConnectedprofile.getUUIDString());
-                startActivityForResult(vprefintent, START_VPN_CONFIG);
-            } else {
-                Toast.makeText(getActivity(), R.string.log_no_last_vpn, Toast.LENGTH_LONG).show();
-            }
-        } else if (item.getItemId() == R.id.toggle_time) {
-            showHideOptionsPanel();
-        } else if (item.getItemId() == android.R.id.home) {
-            // This is called when the Home (Up) button is pressed
-            // in the Action Bar.
-            Intent parentActivityIntent = new Intent(getActivity(), MainActivity.class);
-            parentActivityIntent.addFlags(
-                    Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                            Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(parentActivityIntent);
-            getActivity().finish();
-            return true;
-
-        }
-        return super.onOptionsItemSelected(item);
-
+        } else if(item.getItemId()==R.id.send) {
+			ladapter.shareLog();
+	} else if(item.getItemId()==R.id.edit_vpn) {
+	    VpnProfile lastConnectedprofile = ProfileManager.getLastConnectedVpn();
+
+	    if(lastConnectedprofile!=null) {
+		Intent vprefintent = new Intent(getActivity(),Dashboard.class)
+		    .putExtra(VpnProfile.EXTRA_PROFILEUUID,lastConnectedprofile.getUUIDString());
+		startActivityForResult(vprefintent,START_VPN_CONFIG);
+	    } else {
+		Toast.makeText(getActivity(), R.string.log_no_last_vpn, Toast.LENGTH_LONG).show();
+	    }
+	} else if(item.getItemId() == R.id.toggle_time) {
+	    showHideOptionsPanel();
+	} else if(item.getItemId() == android.R.id.home) {
+	    // This is called when the Home (Up) button is pressed
+	    // in the Action Bar.
+	    Intent parentActivityIntent = new Intent(getActivity(), Dashboard.class);
+	    parentActivityIntent.addFlags(
+					  Intent.FLAG_ACTIVITY_CLEAR_TOP |
+					  Intent.FLAG_ACTIVITY_NEW_TASK);
+	    startActivity(parentActivityIntent);
+	    getActivity().finish();
+	    return true;
+
+	}
+	return super.onOptionsItemSelected(item);
     }
 
     private void showHideOptionsPanel() {
diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/main/res/menu/logmenu.xml
index 90eba679..2709b723 100644
--- a/main/src/main/res/menu/logmenu.xml
+++ b/main/src/main/res/menu/logmenu.xml
@@ -37,6 +37,8 @@
             android:id="@+id/edit_vpn"

             android:alphabeticShortcut="e"

             android:icon="@drawable/ic_menu_edit"

-            android:showAsAction="ifRoom"

-            android:title="@string/edit_vpn"/>

-</menu>
\ No newline at end of file
+            android:showAsAction="withText|ifRoom"

+            android:title="@string/edit_vpn"

+	    android:visible="false"/>

+

+</menu>