Merge branch 'bug/VoidVpn-runs-on-UI-sometimes-crashes-#6227' into develop

3 files changed, 74 insertions, 38 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 286d88c3..d80755aa 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -21,13 +21,14 @@ import org.json.JSONObject;
 
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
+import se.leap.bitmaskclient.FragmentManagerEnhanced;
 import se.leap.bitmaskclient.SignUpDialog;
+
 import de.blinkt.openvpn.activities.LogWindow;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -78,6 +79,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	private boolean authed_eip = false;
 
     public ProviderAPIResultReceiver providerAPI_result_receiver;
+    private FragmentManagerEnhanced fragment_manager;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -90,6 +92,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	    mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
 	    
 	    preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
+	    fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
 	    handleVersion();
 	    
 	    authed_eip = preferences.getBoolean(EIP.AUTHED_EIP, false);
@@ -194,7 +197,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 		
 	    mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
 
-		FragmentManager fragMan = getFragmentManager();
 		if ( provider.hasEIP()){
 			eipFragment = new EipServiceFragment();
 			if (hide_and_turn_on_eip) {
@@ -203,7 +205,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 			    arguments.putBoolean(EipServiceFragment.START_ON_BOOT, true);
 			    eipFragment.setArguments(arguments);
 			}
-			fragMan.beginTransaction().replace(R.id.servicesCollection, eipFragment, EipServiceFragment.TAG).commit();
+			fragment_manager.replace(R.id.servicesCollection, eipFragment, EipServiceFragment.TAG);
 
 			if (hide_and_turn_on_eip) {
 			    onBackPressed();
@@ -293,23 +295,12 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 	command.putExtra(ProviderAPI.RECEIVER_KEY, providerAPI_result_receiver);
 	return command;
     }
-
-    private FragmentTransaction removePreviousFragment(String tag) {
-	FragmentTransaction transaction = getFragmentManager().beginTransaction();
-	Fragment previous_fragment = getFragmentManager().findFragmentByTag(tag);
-	if (previous_fragment != null) {
-	    transaction.remove(previous_fragment);
-	}
-	transaction.addToBackStack(null);
-
-	return transaction;
-    }
     
     /**
      * Shows the log in dialog.
      */
     public void logInDialog(Bundle resultData) {
-	FragmentTransaction transaction = removePreviousFragment(LogInDialog.TAG);
+	FragmentTransaction transaction = fragment_manager.removePreviousFragment(LogInDialog.TAG);
 
 	DialogFragment newFragment = LogInDialog.newInstance();
 	if(resultData != null && !resultData.isEmpty())
@@ -363,7 +354,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
      * Shows the sign up dialog.
      */
     public void signUpDialog(Bundle resultData) {
-	FragmentTransaction transaction = removePreviousFragment(SignUpDialog.TAG);
+	FragmentTransaction transaction = fragment_manager.removePreviousFragment(SignUpDialog.TAG);
 
 	DialogFragment newFragment = SignUpDialog.newInstance();
 	if(resultData != null && !resultData.isEmpty()) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java
new file mode 100644
index 00000000..c4844be9
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2013 LEAP Encryption Access Project and contributers
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package se.leap.bitmaskclient;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+
+public class FragmentManagerEnhanced {
+
+    private FragmentManager generic_fragment_manager;
+    
+    public FragmentManagerEnhanced(FragmentManager generic_fragment_manager) {
+	this.generic_fragment_manager = generic_fragment_manager;
+    }
+    
+    public FragmentTransaction removePreviousFragment(String tag) {
+	FragmentTransaction transaction = generic_fragment_manager.beginTransaction();
+	Fragment previous_fragment = generic_fragment_manager.findFragmentByTag(tag);
+	if (previous_fragment != null) {
+	    transaction.remove(previous_fragment);
+	}
+	transaction.addToBackStack(null);
+
+	return transaction;
+    }
+
+    public void replace(int containerViewId, Fragment fragment, String tag) {
+	FragmentTransaction transaction = generic_fragment_manager.beginTransaction();
+	
+	transaction.replace(containerViewId, fragment, tag).commit();
+    }
+
+    public Fragment findFragmentByTag(String tag) {
+	return generic_fragment_manager.findFragmentByTag(tag);
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/VoidVpnService.java b/app/src/main/java/se/leap/bitmaskclient/VoidVpnService.java
index b7289c23..7b597554 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VoidVpnService.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VoidVpnService.java
@@ -1,10 +1,11 @@
 package se.leap.bitmaskclient;
 
 import android.content.Intent;
+import android.os.Process;
 import android.net.VpnService;
 import android.util.Log;
 
-public class VoidVpnService extends VpnService {
+public class VoidVpnService extends VpnService  {
 
     static final String START_BLOCKING_VPN_PROFILE = "se.leap.bitmaskclient.START_BLOCKING_VPN_PROFILE";
     static final String TAG = VoidVpnService.class.getSimpleName();
@@ -14,29 +15,22 @@ public class VoidVpnService extends VpnService {
 	String action = intent.getAction();
 	if (action == START_BLOCKING_VPN_PROFILE) {
 	    new Thread(new Runnable() {
-		    public void run() {
-			blockConnections();
+		    public void run() {			
+			Builder builder = new Builder();
+			builder.setSession("Blocking until running");
+			builder.addAddress("10.42.0.8",16);
+			builder.addRoute("0.0.0.0", 1);
+			builder.addRoute("192.168.1.0", 24);
+			builder.addDnsServer("10.42.0.1");
+			try {
+			    builder.establish();
+			} catch (Exception e) {
+			    e.printStackTrace();
+			}
+			android.util.Log.d(TAG, "VoidVpnService set up");
 		    }
 		}).run();
 	}
 	return 0;
     }
-        
-    public void blockConnections() {
-	Builder builder = new Builder();
-	builder.setSession("Blocking until running");
-	builder.addAddress("10.42.0.8",16);
-	builder.addRoute("0.0.0.0", 1);
-	builder.addRoute("128.0.0.0", 1);
-	builder.addRoute("192.168.1.0", 24);
-	builder.addDnsServer("10.42.0.1");
-	builder.establish();
-	android.util.Log.d(TAG, "VoidVpnService set up");
-	try {
-	    new java.net.Socket("sdf.org", 80);
-	    Log.d(TAG, "VoidVpnService doesn's stop traffic");
-	} catch (Exception e) {
-	    e.printStackTrace();
-	}
-    }
 }