refactor dashboard

10 files changed, 210 insertions, 180 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index a1fc7cdc..d75d6d53 100644
--- a/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -23,7 +23,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler.Callback;
 import android.os.Message;
-import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.text.SpannableString;
@@ -54,30 +53,27 @@ import java.util.Locale;
 import java.util.Vector;
 
 import de.blinkt.openvpn.LaunchVPN;
-import se.leap.bitmaskclient.R;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.activities.DisconnectVPN;
 import de.blinkt.openvpn.core.ConnectionStatus;
+import de.blinkt.openvpn.core.LogItem;
 import de.blinkt.openvpn.core.OpenVPNManagement;
 import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.Preferences;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus;
-import de.blinkt.openvpn.core.LogItem;
 import de.blinkt.openvpn.core.VpnStatus.LogListener;
 import de.blinkt.openvpn.core.VpnStatus.StateListener;
+import se.leap.bitmaskclient.Dashboard;
+import se.leap.bitmaskclient.R;
 
 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;
     private static final String VERBOSITYLEVEL = "verbositylevel";
 
-
-
     private SeekBar mLogLevelSlider;
     private LinearLayout mOptionsLayout;
     private RadioGroup mTimeRadioGroup;
@@ -434,16 +430,6 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
             return true;
         } else if (item.getItemId() == R.id.send) {
             ladapter.shareLog();
-        } else if (item.getItemId() == R.id.edit_vpn) {
-            VpnProfile lastConnectedprofile = ProfileManager.get(getActivity(), VpnStatus.getLastConnectedVPNProfile());
-
-            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) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
index 21520dc4..52c8f8e5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
@@ -301,7 +301,7 @@ public abstract class BaseConfigurationWizard extends Activity
 
     private void askDashboardToQuitApp() {
         Intent ask_quit = new Intent();
-        ask_quit.putExtra(Dashboard.ACTION_QUIT, Dashboard.ACTION_QUIT);
+        ask_quit.putExtra(Constants.APP_ACTION_QUIT, Constants.APP_ACTION_QUIT);
         setResult(RESULT_CANCELED, ask_quit);
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/Constants.java b/app/src/main/java/se/leap/bitmaskclient/Constants.java
index a7ab56fd..7ee3adab 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Constants.java
@@ -10,6 +10,23 @@ public interface Constants {
     String PREFERENCES_APP_VERSION = "bitmask version";
 
 
+     //////////////////////////////////////////////
+    // REQUEST CODE CONSTANTS
+    /////////////////////////////////////////////
+
+    String REQUEST_CODE_KEY = "request_code";
+    int REQUEST_CODE_CONFIGURE_LEAP = 0;
+    int REQUEST_CODE_SWITCH_PROVIDER = 1;
+
+
+    //////////////////////////////////////////////
+    // APP CONSTANTS
+    /////////////////////////////////////////////
+
+    String APP_ACTION_QUIT = "quit";
+    String APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE = "configure always-on profile";
+
+
     //////////////////////////////////////////////
     // EIP CONSTANTS
     /////////////////////////////////////////////
@@ -30,7 +47,6 @@ public interface Constants {
     String EIP_IS_ALWAYS_ON = "EIP.EIP_IS_ALWAYS_ON";
 
 
-
     //////////////////////////////////////////////
     // PROVIDER CONSTANTS
     /////////////////////////////////////////////
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index f1e7b3bd..1eed484c 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -20,7 +20,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -47,6 +46,8 @@ import se.leap.bitmaskclient.userstatus.UserStatusFragment;
 
 import static se.leap.bitmaskclient.Constants.EIP_IS_ALWAYS_ON;
 import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
+import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
+import static se.leap.bitmaskclient.Constants.REQUEST_CODE_SWITCH_PROVIDER;
 
 /**
  * The main user facing Activity of Bitmask Android, consisting of status, controls,
@@ -55,13 +56,9 @@ import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
  * @author Sean Leonard <meanderingcode@aetherislands.net>
  * @author parmegv
  */
-public class Dashboard extends Activity implements ProviderAPIResultReceiver.Receiver {
-
-    protected static final int CONFIGURE_LEAP = 0;
-    protected static final int SWITCH_PROVIDER = 1;
+public class Dashboard extends Activity {
 
     public static final String TAG = Dashboard.class.getSimpleName();
-    public static final String ACTION_QUIT = "quit";
 
     /**
      * When "Disconnect" is clicked from the notification this extra gets added to the calling intent.
@@ -69,39 +66,38 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
     public static final String ACTION_ASK_TO_CANCEL_VPN = "ask to cancel vpn";
     /**
      * if always-on feature is enabled, but there's no provider configured the EIP Service
-     * adds this intent extra. ACTION_CONFIGURE_ALWAYS_ON_PROFILE
+     * adds this intent extra. Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE
      * serves to start the Configuration Wizard on top of the Dashboard Activity.
      */
-    public static final String ACTION_CONFIGURE_ALWAYS_ON_PROFILE = "configure always-on profile";
-    public static final String REQUEST_CODE = "request_code";
-    public static final String PARAMETERS = "dashboard parameters";
-    public static final String APP_VERSION = "bitmask version";
 
-    //FIXME: context classes in static fields lead to memory leaks!
-    private static Context dashboardContext;
     protected static SharedPreferences preferences;
-    private FragmentManagerEnhanced fragment_manager;
+    private static FragmentManagerEnhanced fragment_manager;
 
     @InjectView(R.id.providerName)
     TextView provider_name;
 
-    VpnFragment eip_fragment;
-    UserStatusFragment user_status_fragment;
+    private VpnFragment eip_fragment;
+    private UserStatusFragment user_status_fragment;
+
     private static Provider provider = new Provider();
-    public ProviderAPIResultReceiver providerAPI_result_receiver;
-    private boolean switching_provider;
+    public static ProviderAPIResultReceiver providerAPI_result_receiver;
+    private static boolean switching_provider;
+    private boolean handledVersion;
+
+    public static DashboardReceiver dashboardReceiver;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        dashboardReceiver = new DashboardReceiver(this);
         preferences = getSharedPreferences(Constants.SHARED_PREFERENCES, MODE_PRIVATE);
         fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
 
-        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler(), this);
+        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler(), dashboardReceiver);
 
-        if (dashboardContext == null) {
-            dashboardContext = this;
+        if (handledVersion) {
             handleVersion();
+            handledVersion = true;
         }
 
         prepareEIP(savedInstanceState);
@@ -183,15 +179,15 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
         } else if (intent.hasExtra(EIP_RESTART_ON_BOOT)) {
             Log.d(TAG, "Dashboard: EIP_RESTART_ON_BOOT");
             prepareEIP(null);
-        } else if (intent.hasExtra(ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
-            Log.d(TAG, "Dashboard: ACTION_CONFIGURE_ALWAYS_ON_PROFILE");
+        } else if (intent.hasExtra(Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
+            Log.d(TAG, "Dashboard: Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE");
             handleConfigureAlwaysOn(getIntent());
         }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == CONFIGURE_LEAP || requestCode == SWITCH_PROVIDER) {
+        if (requestCode == REQUEST_CODE_CONFIGURE_LEAP || requestCode == REQUEST_CODE_SWITCH_PROVIDER) {
             if (resultCode == RESULT_OK && data.hasExtra(Provider.KEY)) {
                 provider = data.getParcelableExtra(Provider.KEY);
                 providerToPreferences(provider);
@@ -202,7 +198,7 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
                     sessionDialog(Bundle.EMPTY);
                 }
 
-            } else if (resultCode == RESULT_CANCELED && data != null && data.hasExtra(ACTION_QUIT)) {
+            } else if (resultCode == RESULT_CANCELED && data != null && data.hasExtra(Constants.APP_ACTION_QUIT)) {
                 finish();
             } else
                 configErrorDialog();
@@ -217,9 +213,9 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
     }
 
     private void handleConfigureAlwaysOn(Intent intent) {
-            intent.removeExtra(ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
+            intent.removeExtra(Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
             Log.d(TAG, "start Configuration wizard!");
-            startActivityForResult(new Intent(this, ConfigurationWizard.class), CONFIGURE_LEAP);
+            startActivityForResult(new Intent(this, ConfigurationWizard.class), Constants.REQUEST_CODE_CONFIGURE_LEAP);
     }
 
     private void prepareEIP(Bundle savedInstanceState) {
@@ -239,10 +235,10 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
     }
 
     private void configureLeapProvider() {
-        if (getIntent().hasExtra(ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
-            getIntent().removeExtra(ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
+        if (getIntent().hasExtra(Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
+            getIntent().removeExtra(Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
         }
-        startActivityForResult(new Intent(this, ConfigurationWizard.class), CONFIGURE_LEAP);
+        startActivityForResult(new Intent(this, ConfigurationWizard.class), Constants.REQUEST_CODE_CONFIGURE_LEAP);
     }
     @SuppressLint("CommitPrefEdits")
     private void providerToPreferences(Provider provider) {
@@ -253,7 +249,7 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
     }
 
     private void configErrorDialog() {
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
+        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(this);
         alertBuilder.setTitle(getResources().getString(R.string.setup_error_title));
         alertBuilder
                 .setMessage(getResources().getString(R.string.setup_error_text))
@@ -261,7 +257,7 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
                 .setPositiveButton(getResources().getString(R.string.setup_error_configure_button), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        startActivityForResult(new Intent(getContext(), ConfigurationWizard.class), CONFIGURE_LEAP);
+                        startActivityForResult(new Intent(getApplicationContext(), ConfigurationWizard.class), Constants.REQUEST_CODE_CONFIGURE_LEAP);
                     }
                 })
                 .setNegativeButton(getResources().getString(R.string.setup_error_close_button), new DialogInterface.OnClickListener() {
@@ -307,7 +303,7 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
      *
      * @param hideAndTurnOnEipOnBoot Flag that indicates if system intent android.intent.action.BOOT_COMPLETED
      *                               has caused to start Dashboard
-     * @return
+     * @return the created VPNFragment
      */
     private VpnFragment prepareEipFragment(boolean hideAndTurnOnEipOnBoot) {
         VpnFragment eip_fragment = new VpnFragment();
@@ -325,7 +321,7 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
 
     /**
      * checks if Android's VPN feature 'always-on' is enabled for Bitmask
-     * @return
+     * @return true if 'always-on' is enabled false if not
      */
     private boolean isAlwaysOn() {
         return  preferences.getBoolean(EIP_IS_ALWAYS_ON, false);
@@ -374,11 +370,13 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
     }
 
     public void showLog() {
-        LogWindowWrapper log_window_wrapper = LogWindowWrapper.getInstance(getContext());
+        LogWindowWrapper log_window_wrapper = LogWindowWrapper.getInstance(this);
         log_window_wrapper.showLog();
     }
 
-    public void downloadVpnCertificate() {
+
+    // TODO MOVE TO VPNManager(?)
+    public static void downloadVpnCertificate() {
         boolean is_authenticated = User.loggedIn();
         boolean allowed_anon = preferences.getBoolean(Constants.PROVIDER_ALLOW_ANONYMOUS, false);
         if (allowed_anon || is_authenticated)
@@ -387,7 +385,8 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
             sessionDialog(Bundle.EMPTY);
     }
 
-    public void sessionDialog(Bundle resultData) {
+    // TODO how can we replace this
+    public static void sessionDialog(Bundle resultData) {
         try {
             FragmentTransaction transaction = fragment_manager.removePreviousFragment(SessionDialog.TAG);
             SessionDialog.getInstance(provider, resultData).show(transaction, SessionDialog.TAG);
@@ -401,47 +400,52 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
 
         preferences.edit().clear().apply();
         switching_provider = false;
-        startActivityForResult(new Intent(this, ConfigurationWizard.class), SWITCH_PROVIDER);
+        startActivityForResult(new Intent(this, ConfigurationWizard.class), Constants.REQUEST_CODE_SWITCH_PROVIDER);
     }
 
-    @Override
-    public void onReceiveResult(int resultCode, Bundle resultData) {
-        if (resultCode == ProviderAPI.SUCCESSFUL_SIGNUP) {
-            String username = resultData.getString(SessionDialog.USERNAME);
-            String password = resultData.getString(SessionDialog.PASSWORD);
-            user_status_fragment.logIn(username, password);
-        } else if (resultCode == ProviderAPI.FAILED_SIGNUP) {
-            sessionDialog(resultData);
-        } else if (resultCode == ProviderAPI.SUCCESSFUL_LOGIN) {
-            downloadVpnCertificate();
-        } else if (resultCode == ProviderAPI.FAILED_LOGIN) {
-            sessionDialog(resultData);
-        } else if (resultCode == ProviderAPI.SUCCESSFUL_LOGOUT) {
-            if (switching_provider) switchProvider();
-        } else if (resultCode == ProviderAPI.LOGOUT_FAILED) {
-            setResult(RESULT_CANCELED);
-        } else if (resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {
-            eip_fragment.updateEipService();
-            setResult(RESULT_OK);
-        } else if (resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
-            setResult(RESULT_CANCELED);
-        } else if (resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_EIP_SERVICE) {
-            eip_fragment.updateEipService();
-            setResult(RESULT_OK);
-        } else if (resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_EIP_SERVICE) {
-            setResult(RESULT_CANCELED);
+    public static class DashboardReceiver implements ProviderAPIResultReceiver.Receiver{
+
+        private Dashboard dashboard;
+
+        DashboardReceiver(Dashboard dashboard) {
+            this.dashboard = dashboard;
         }
-    }
 
-    public static Context getContext() {
-        return dashboardContext;
+        @Override
+        public void onReceiveResult(int resultCode, Bundle resultData) {
+            if (resultCode == ProviderAPI.SUCCESSFUL_SIGNUP) {
+                String username = resultData.getString(SessionDialog.USERNAME);
+                String password = resultData.getString(SessionDialog.PASSWORD);
+                dashboard.user_status_fragment.logIn(username, password);
+            } else if (resultCode == ProviderAPI.FAILED_SIGNUP) {
+                Dashboard.sessionDialog(resultData);
+            } else if (resultCode == ProviderAPI.SUCCESSFUL_LOGIN) {
+                Dashboard.downloadVpnCertificate();
+            } else if (resultCode == ProviderAPI.FAILED_LOGIN) {
+                Dashboard.sessionDialog(resultData);
+            } else if (resultCode == ProviderAPI.SUCCESSFUL_LOGOUT) {
+                if (switching_provider) dashboard.switchProvider();
+            } else if (resultCode == ProviderAPI.LOGOUT_FAILED) {
+                dashboard.setResult(RESULT_CANCELED);
+            } else if (resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE) {
+                dashboard.eip_fragment.updateEipService();
+                dashboard.setResult(RESULT_OK);
+            } else if (resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
+                dashboard.setResult(RESULT_CANCELED);
+            } else if (resultCode == ProviderAPI.CORRECTLY_DOWNLOADED_EIP_SERVICE) {
+                dashboard.eip_fragment.updateEipService();
+                dashboard.setResult(RESULT_OK);
+            } else if (resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_EIP_SERVICE) {
+                dashboard.setResult(RESULT_CANCELED);
+            }
+        }
     }
 
     public static Provider getProvider() { return provider; }
 
     @Override
     public void startActivityForResult(Intent intent, int requestCode) {
-        intent.putExtra(Dashboard.REQUEST_CODE, requestCode);
+        intent.putExtra(Constants.REQUEST_CODE_KEY, requestCode);
         super.startActivityForResult(intent, requestCode);
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
index f9aa2660..a87e0460 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
@@ -41,7 +41,7 @@ public class OnBootReceiver extends BroadcastReceiver {
         } else {
             if (isAlwaysOnConfigured) {
                 Intent dashboard_intent = new Intent(context, Dashboard.class);
-                dashboard_intent.putExtra(Dashboard.ACTION_CONFIGURE_ALWAYS_ON_PROFILE, true);
+                dashboard_intent.putExtra(Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE, true);
                 dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(dashboard_intent);
             }
diff --git a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
index f1a15efd..2b968769 100644
--- a/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/VpnFragment.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -72,12 +73,13 @@ public class VpnFragment extends Fragment implements Observer {
     protected static final String IS_CONNECTED = TAG + ".is_connected";
     public static final String START_EIP_ON_BOOT = "start on boot";
 
+    private SharedPreferences preferences;
+
     @InjectView(R.id.vpn_status_image)
     FabButton vpn_status_image;
     @InjectView(R.id.vpn_main_button)
     Button main_button;
 
-    private Dashboard dashboard;
     private static EIPReceiver eip_receiver;
     private static EipStatus eip_status;
     private boolean wants_to_connect;
@@ -104,8 +106,6 @@ public class VpnFragment extends Fragment implements Observer {
     //FIXME: replace with onAttach(Context context)
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-
-        dashboard = (Dashboard) activity;
         downloadEIPServiceConfig();
     }
 
@@ -115,6 +115,7 @@ public class VpnFragment extends Fragment implements Observer {
         eip_status = EipStatus.getInstance();
         eip_status.addObserver(this);
         eip_receiver = new EIPReceiver(new Handler());
+        preferences = getActivity().getSharedPreferences(Constants.SHARED_PREFERENCES, Context.MODE_PRIVATE);
     }
 
     @Override
@@ -142,7 +143,7 @@ public class VpnFragment extends Fragment implements Observer {
     @Override
     public void onPause() {
         super.onPause();
-        dashboard.unbindService(openVpnConnection);
+        getActivity().unbindService(openVpnConnection);
     }
 
     @Override
@@ -152,7 +153,7 @@ public class VpnFragment extends Fragment implements Observer {
     }
 
     private void saveStatus(boolean restartOnBoot) {
-        Dashboard.preferences.edit().putBoolean(EIP_RESTART_ON_BOOT, restartOnBoot).apply();
+        preferences.edit().putBoolean(EIP_RESTART_ON_BOOT, restartOnBoot).apply();
     }
 
     @OnClick(R.id.vpn_main_button)
@@ -169,7 +170,7 @@ public class VpnFragment extends Fragment implements Observer {
         else if (canLogInToStartEIP()) {
             wants_to_connect = true;
             Bundle bundle = new Bundle();
-            dashboard.sessionDialog(bundle);
+            Dashboard.sessionDialog(bundle);
         } else {
             Log.d(TAG, "WHAT IS GOING ON HERE?!");
             // TODO: implement a fallback: check if vpncertificate was not downloaded properly or give
@@ -178,13 +179,13 @@ public class VpnFragment extends Fragment implements Observer {
     }
 
     private boolean canStartEIP() {
-        boolean certificateExists = !Dashboard.preferences.getString(PROVIDER_VPN_CERTIFICATE, "").isEmpty();
-        boolean isAllowedAnon = Dashboard.preferences.getBoolean(PROVIDER_ALLOW_ANONYMOUS, false);
+        boolean certificateExists = !preferences.getString(PROVIDER_VPN_CERTIFICATE, "").isEmpty();
+        boolean isAllowedAnon = preferences.getBoolean(PROVIDER_ALLOW_ANONYMOUS, false);
         return (isAllowedAnon || certificateExists) && !eip_status.isConnected() && !eip_status.isConnecting();
     }
 
     private boolean canLogInToStartEIP() {
-        boolean isAllowedRegistered = Dashboard.preferences.getBoolean(PROVIDER_ALLOWED_REGISTERED, false);
+        boolean isAllowedRegistered = preferences.getBoolean(PROVIDER_ALLOWED_REGISTERED, false);
         boolean isLoggedIn = !LeapSRPSession.getToken().isEmpty();
         return isAllowedRegistered && !isLoggedIn && !eip_status.isConnecting() && !eip_status.isConnected();
     }
@@ -200,16 +201,17 @@ public class VpnFragment extends Fragment implements Observer {
     }
 
     private void askPendingStartCancellation() {
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(dashboard);
-        alertBuilder.setTitle(dashboard.getString(R.string.eip_cancel_connect_title))
-                .setMessage(dashboard.getString(R.string.eip_cancel_connect_text))
+        Activity activity = getActivity();
+        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity());
+        alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title))
+                .setMessage(activity.getString(R.string.eip_cancel_connect_text))
                 .setPositiveButton((android.R.string.yes), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         askToStopEIP();
                     }
                 })
-                .setNegativeButton(dashboard.getString(android.R.string.no), new DialogInterface.OnClickListener() {
+                .setNegativeButton(activity.getString(android.R.string.no), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                     }
@@ -233,13 +235,14 @@ public class VpnFragment extends Fragment implements Observer {
 
     private void stopBlockingVpn() {
         Log.d(TAG, "stop VoidVpn!");
-        Intent stopVoidVpnIntent = new Intent(dashboard, VoidVpnService.class);
+        Activity activity = getActivity();
+        Intent stopVoidVpnIntent = new Intent(activity, VoidVpnService.class);
         stopVoidVpnIntent.setAction(EIP_ACTION_STOP_BLOCKING_VPN);
-        dashboard.startService(stopVoidVpnIntent);
+        activity.startService(stopVoidVpnIntent);
     }
 
     private void disconnect() {
-        ProfileManager.setConntectedVpnProfileDisconnected(dashboard);
+        ProfileManager.setConntectedVpnProfileDisconnected(getActivity());
         if (mService != null) {
             try {
                 mService.stopVPN(false);
@@ -255,22 +258,23 @@ public class VpnFragment extends Fragment implements Observer {
     }
 
     private void downloadEIPServiceConfig() {
-        ProviderAPIResultReceiver provider_api_receiver = new ProviderAPIResultReceiver(new Handler(), dashboard);
+        ProviderAPIResultReceiver provider_api_receiver = new ProviderAPIResultReceiver(new Handler(), Dashboard.dashboardReceiver);
         if(eip_receiver != null)
             ProviderAPICommand.execute(Bundle.EMPTY, ProviderAPI.DOWNLOAD_EIP_SERVICE, provider_api_receiver);
     }
 
     protected void askToStopEIP() {
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(dashboard);
-        alertBuilder.setTitle(dashboard.getString(R.string.eip_cancel_connect_title))
-                .setMessage(dashboard.getString(R.string.eip_warning_browser_inconsistency))
+        Activity activity = getActivity();
+        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(activity);
+        alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title))
+                .setMessage(activity.getString(R.string.eip_warning_browser_inconsistency))
                 .setPositiveButton((android.R.string.yes), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         stopEipIfPossible();
                     }
                 })
-                .setNegativeButton(dashboard.getString(android.R.string.no), new DialogInterface.OnClickListener() {
+                .setNegativeButton(activity.getString(android.R.string.no), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                     }
@@ -289,18 +293,19 @@ public class VpnFragment extends Fragment implements Observer {
      *               filter for the EIP class
      */
     private void eipCommand(String action) {
+        Activity activity = getActivity();
         // TODO validate "action"...how do we get the list of intent-filters for a class via Android API?
-        Intent vpn_intent = new Intent(dashboard.getApplicationContext(), EIP.class);
+        Intent vpn_intent = new Intent(activity.getApplicationContext(), EIP.class);
         vpn_intent.setAction(action);
         vpn_intent.putExtra(EIP_RECEIVER, eip_receiver);
-        dashboard.startService(vpn_intent);
+        activity.startService(vpn_intent);
     }
 
     @Override
     public void update(Observable observable, Object data) {
         if (observable instanceof EipStatus) {
             eip_status = (EipStatus) observable;
-            dashboard.runOnUiThread(new Runnable() {
+            getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     handleNewState();
@@ -335,12 +340,13 @@ public class VpnFragment extends Fragment implements Observer {
     }
 
     private void updateButton() {
+        Activity activity = getActivity();
         if (eip_status.isConnecting()) {
-            main_button.setText(dashboard.getString(android.R.string.cancel));
+            main_button.setText(activity.getString(android.R.string.cancel));
         } else if (eip_status.isConnected() || isOpenVpnRunningWithoutNetwork()) {
-            main_button.setText(dashboard.getString(R.string.vpn_button_turn_off));
+            main_button.setText(activity.getString(R.string.vpn_button_turn_off));
         } else {
-            main_button.setText(dashboard.getString(R.string.vpn_button_turn_on));
+            main_button.setText(activity.getString(R.string.vpn_button_turn_on));
         }
     }
 
@@ -358,14 +364,15 @@ public class VpnFragment extends Fragment implements Observer {
     }
 
     private void bindOpenVpnService() {
-        Intent intent = new Intent(dashboard, OpenVPNService.class);
+        Activity activity = getActivity();
+        Intent intent = new Intent(activity, OpenVPNService.class);
         intent.setAction(OpenVPNService.START_SERVICE);
-        dashboard.bindService(intent, openVpnConnection, Context.BIND_AUTO_CREATE);
+        activity.bindService(intent, openVpnConnection, Context.BIND_AUTO_CREATE);
     }
 
     protected class EIPReceiver extends ResultReceiver {
 
-        protected EIPReceiver(Handler handler) {
+        EIPReceiver(Handler handler) {
             super(handler);
         }
 
@@ -375,47 +382,55 @@ public class VpnFragment extends Fragment implements Observer {
 
             String request = resultData.getString(EIP_REQUEST);
 
-            if (request.equals(EIP_ACTION_START)) {
-                switch (resultCode) {
-                    case Activity.RESULT_OK:
-                        break;
-                    case Activity.RESULT_CANCELED:
+            if (request == null) {
+                return;
+            }
 
-                        break;
-                }
-            } else if (request.equals(EIP_ACTION_STOP)) {
-                switch (resultCode) {
-                    case Activity.RESULT_OK:
-                        stop();
-                        break;
-                    case Activity.RESULT_CANCELED:
-                        break;
-                }
-            } else if (request.equals(EIP_NOTIFICATION)) {
-                switch (resultCode) {
-                    case Activity.RESULT_OK:
-                        break;
-                    case Activity.RESULT_CANCELED:
-                        break;
-                }
-            } else if (request.equals(EIP_ACTION_CHECK_CERT_VALIDITY)) {
-                switch (resultCode) {
-                    case Activity.RESULT_OK:
-                        break;
-                    case Activity.RESULT_CANCELED:
-                        dashboard.downloadVpnCertificate();
-                        break;
-                }
-            } else if (request.equals(EIP_ACTION_UPDATE)) {
-                switch (resultCode) {
-                    case Activity.RESULT_OK:
-                        if (wants_to_connect)
-                            startEipFromScratch();
-                        break;
-                    case Activity.RESULT_CANCELED:
-                        handleNewState();
-                        break;
-                }
+            switch (request) {
+                case EIP_ACTION_START:
+                    switch (resultCode) {
+                        case Activity.RESULT_OK:
+                            break;
+                        case Activity.RESULT_CANCELED:
+                            break;
+                    }
+                    break;
+                case EIP_ACTION_STOP:
+                    switch (resultCode) {
+                        case Activity.RESULT_OK:
+                            stop();
+                            break;
+                        case Activity.RESULT_CANCELED:
+                            break;
+                    }
+                    break;
+                case EIP_NOTIFICATION:
+                    switch (resultCode) {
+                        case Activity.RESULT_OK:
+                            break;
+                        case Activity.RESULT_CANCELED:
+                            break;
+                    }
+                    break;
+                case EIP_ACTION_CHECK_CERT_VALIDITY:
+                    switch (resultCode) {
+                        case Activity.RESULT_OK:
+                            break;
+                        case Activity.RESULT_CANCELED:
+                            Dashboard.downloadVpnCertificate();
+                            break;
+                    }
+                    break;
+                case EIP_ACTION_UPDATE:
+                    switch (resultCode) {
+                        case Activity.RESULT_OK:
+                            if (wants_to_connect)
+                                startEipFromScratch();
+                            break;
+                        case Activity.RESULT_CANCELED:
+                            handleNewState();
+                            break;
+                    }
             }
         }
     }
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index a84ab941..998d2c87 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -16,15 +16,21 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import android.app.*;
-import android.content.*;
-import android.os.*;
+import android.app.Activity;
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.ResultReceiver;
 import android.util.Log;
 
-import org.json.*;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-import de.blinkt.openvpn.*;
-import se.leap.bitmaskclient.*;
+import de.blinkt.openvpn.LaunchVPN;
+import se.leap.bitmaskclient.OnBootReceiver;
+import se.leap.bitmaskclient.VpnFragment;
 
 import static se.leap.bitmaskclient.Constants.EIP_ACTION_CHECK_CERT_VALIDITY;
 import static se.leap.bitmaskclient.Constants.EIP_ACTION_IS_RUNNING;
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
index 28099f06..197a080b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnCertificateValidator.java
@@ -16,10 +16,13 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import java.security.cert.*;
-import java.util.*;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.Calendar;
+import java.util.Date;
 
-import se.leap.bitmaskclient.*;
+import se.leap.bitmaskclient.ConfigHelper;
 
 public class VpnCertificateValidator {
     public final static String TAG = VpnCertificateValidator.class.getSimpleName();
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
index 54563ec4..b1318def 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
@@ -16,11 +16,14 @@
  */
 package se.leap.bitmaskclient.eip;
 
-import org.json.*;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-import java.util.*;
+import java.util.Iterator;
 
-import se.leap.bitmaskclient.*;
+import se.leap.bitmaskclient.Constants;
+import se.leap.bitmaskclient.Provider;
 
 public class VpnConfigGenerator {
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
index 14323f8e..f4be3ea1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
@@ -28,7 +28,6 @@ import se.leap.bitmaskclient.R;
 public class UserStatusFragment extends Fragment implements Observer, SessionDialog.SessionDialogInterface {
 
     public static String TAG = UserStatusFragment.class.getSimpleName();
-    private static Dashboard dashboard;
     private ProviderAPIResultReceiver providerAPI_result_receiver;
 
     @InjectView(R.id.user_status_username)
@@ -74,16 +73,14 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        dashboard = (Dashboard) activity;
-
-        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler(), dashboard);
+        providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler(), Dashboard.dashboardReceiver);
     }
 
     public void restoreSessionStatus(Bundle savedInstanceState) {
         if (savedInstanceState != null)
             if (savedInstanceState.containsKey(UserStatus.TAG)) {
                 UserStatus.SessionStatus status = (UserStatus.SessionStatus) savedInstanceState.getSerializable(UserStatus.TAG);
-                this.status.updateStatus(status, getResources());
+                UserStatus.updateStatus(status, getResources());
             }
     }
 
@@ -93,7 +90,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
         if(status.isLoggedIn())
             logOut();
         else if(status.isLoggedOut())
-            dashboard.sessionDialog(Bundle.EMPTY);
+            Dashboard.sessionDialog(Bundle.EMPTY);
         else if(status.inProgress())
             cancelLoginOrSignup();
     }
@@ -102,7 +99,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
     public void update(Observable observable, Object data) {
         if (observable instanceof UserStatus) {
             final UserStatus status = (UserStatus) observable;
-            dashboard.runOnUiThread(new Runnable() {
+            getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     handleNewStatus(status);
@@ -138,12 +135,12 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
 
     private void updateButton() {
         if(status.isLoggedIn() || status.didntLogOut())
-            button.setText(dashboard.getString(R.string.logout_button));
+            button.setText(getActivity().getString(R.string.logout_button));
         else if(allows_registration) {
             if (status.isLoggedOut() || status.notLoggedIn())
-                button.setText(dashboard.getString(R.string.login_button));
+                button.setText(getActivity().getString(R.string.login_button));
             else if (status.inProgress())
-                button.setText(dashboard.getString(android.R.string.cancel));
+                button.setText(getActivity().getString(android.R.string.cancel));
         }
     }