Merge branch 'leap_0.9.8' into #8797_certificate_expiration

7 files changed, 11 insertions, 637 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 41c308a2..e69de29b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -1,401 +0,0 @@
-/*
- * 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.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import butterknife.InjectView;
-import de.blinkt.openvpn.core.VpnStatus;
-import se.leap.bitmaskclient.eip.EipCommand;
-import se.leap.bitmaskclient.fragments.AboutFragment;
-import se.leap.bitmaskclient.userstatus.User;
-import se.leap.bitmaskclient.userstatus.UserStatusFragment;
-
-import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE;
-import static se.leap.bitmaskclient.Constants.APP_ACTION_QUIT;
-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.PROVIDER_CONFIGURED;
-import static se.leap.bitmaskclient.Constants.PROVIDER_EIP_DEFINITION;
-import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
-import static se.leap.bitmaskclient.Constants.REQUEST_CODE_KEY;
-import static se.leap.bitmaskclient.Constants.REQUEST_CODE_SWITCH_PROVIDER;
-import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
-
-/**
- * The main user facing Activity of Bitmask Android, consisting of status, controls,
- * and access to preferences.
- *
- * @author Sean Leonard <meanderingcode@aetherislands.net>
- * @author parmegv
- */
-public class Dashboard extends ButterKnifeActivity {
-
-    public static final String TAG = Dashboard.class.getSimpleName();
-
-    /**
-     * When "Disconnect" is clicked from the notification this extra gets added to the calling intent.
-     */
-    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. Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE
-     * serves to start the Configuration Wizard on top of the Dashboard Activity.
-     */
-
-    protected static SharedPreferences preferences;
-    private static FragmentManagerEnhanced fragment_manager;
-
-    @InjectView(R.id.providerName)
-    TextView provider_name;
-
-    private EipFragment eip_fragment;
-    private UserStatusFragment user_status_fragment;
-
-    private static Provider provider = new Provider();
-    private boolean handledVersion;
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
-        fragment_manager = new FragmentManagerEnhanced(getSupportFragmentManager());
-
-
-        if (!handledVersion) {
-            handleVersion();
-            handledVersion = true;
-        }
-
-        // initialize app necessities
-        VpnStatus.initLogCache(getApplicationContext().getCacheDir());
-        User.init(getString(R.string.default_username));
-
-        prepareEIP(savedInstanceState);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        handleVpnCancellation(getIntent());
-    }
-
-    private boolean previousProviderExists(Bundle savedInstanceState) {
-        return providerInSavedInstance(savedInstanceState) || providerInSharedPreferences();
-    }
-
-    private Provider getProvider(Bundle savedInstanceState) {
-        if(providerInSavedInstance(savedInstanceState))
-            provider = savedInstanceState.getParcelable(Provider.KEY);
-        else if (providerInSharedPreferences())
-            provider = getSavedProviderFromSharedPreferences();
-        return provider;
-    }
-
-    private boolean providerInSavedInstance(Bundle savedInstanceState) {
-        return savedInstanceState != null &&
-                savedInstanceState.containsKey(Provider.KEY);
-    }
-
-    private boolean providerInSharedPreferences() {
-        return preferences != null &&
-                preferences.getBoolean(PROVIDER_CONFIGURED, false);
-
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NotNull Bundle outState) {
-        outState.putParcelable(Provider.KEY, provider);
-        super.onSaveInstanceState(outState);
-    }
-
-    private Provider getSavedProviderFromSharedPreferences() {
-        Provider provider = new Provider();
-        try {
-            provider.setMainUrl(new URL(preferences.getString(Provider.MAIN_URL, "")));
-            provider.define(new JSONObject(preferences.getString(Provider.KEY, "")));
-            provider.setCaCert(preferences.getString(Provider.CA_CERT, ""));
-        } catch (MalformedURLException | JSONException e) {
-            e.printStackTrace();
-        }
-
-        return provider;
-    }
-
-    private void handleVersion() {
-        try {
-            int versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
-
-            switch (versionCode) {
-                case 91: // 0.6.0 without Bug #5999
-                case 101: // 0.8.0
-                    if (!preferences.getString(PROVIDER_EIP_DEFINITION, "").isEmpty())
-                    break;
-            }
-        } catch (NameNotFoundException e) {
-            Log.d(TAG, "Handle version didn't find any " + getPackageName() + " package");
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        setIntent(intent);
-        handleIntentExtras(intent);
-    }
-
-    private void handleIntentExtras(Intent intent) {
-        if (intent.hasExtra(ACTION_ASK_TO_CANCEL_VPN)) {
-            handleVpnCancellation(intent);
-        } else if (intent.hasExtra(EIP_RESTART_ON_BOOT)) {
-            Log.d(TAG, "Dashboard: EIP_RESTART_ON_BOOT");
-            prepareEIP(null);
-        } else if (intent.hasExtra(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 == REQUEST_CODE_CONFIGURE_LEAP || requestCode == REQUEST_CODE_SWITCH_PROVIDER) {
-            if (resultCode == RESULT_OK && data.hasExtra(Provider.KEY)) {
-                provider = data.getParcelableExtra(Provider.KEY);
-                providerToPreferences(provider);
-
-                buildDashboard(false);
-                invalidateOptionsMenuOnUiThread();
-                //if (data.hasExtra(SessionDialog.TAG)) {
-                //    sessionDialog(Bundle.EMPTY);
-                //}
-
-            } else if (resultCode == RESULT_CANCELED && data != null && data.hasExtra(APP_ACTION_QUIT)) {
-                finish();
-            } else
-                configErrorDialog();
-        }
-    }
-
-    private void handleVpnCancellation(Intent intent) {
-        if (intent.hasExtra(Dashboard.ACTION_ASK_TO_CANCEL_VPN)) {
-            eip_fragment.askToStopEIP();
-            intent.removeExtra(ACTION_ASK_TO_CANCEL_VPN);
-        }
-    }
-
-    private void handleConfigureAlwaysOn(Intent intent) {
-            intent.removeExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
-            Log.d(TAG, "start Configuration wizard!");
-            startActivityForResult(new Intent(this, ProviderListActivity.class), REQUEST_CODE_CONFIGURE_LEAP);
-    }
-
-    private void prepareEIP(Bundle savedInstanceState) {
-        boolean provider_exists = previousProviderExists(savedInstanceState);
-        if (provider_exists) {
-            provider = getProvider(savedInstanceState);
-            if(!provider.isConfigured()) {
-                configureLeapProvider();
-            } else {
-                Log.d(TAG, "vpn provider is configured");
-                buildDashboard(getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false));
-                user_status_fragment.restoreSessionStatus(savedInstanceState);
-            }
-        } else {
-            configureLeapProvider();
-        }
-    }
-
-    private void configureLeapProvider() {
-        if (getIntent().hasExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
-            getIntent().removeExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
-        }
-        startActivityForResult(new Intent(this, ProviderListActivity.class), REQUEST_CODE_CONFIGURE_LEAP);
-    }
-    @SuppressLint("CommitPrefEdits")
-    private void providerToPreferences(Provider provider) {
-        preferences.edit().putBoolean(PROVIDER_CONFIGURED, true).
-                putString(Provider.MAIN_URL, provider.getMainUrl().toString()).
-                putString(Provider.KEY, provider.getDefinition().toString()).apply();
-    }
-
-    private void configErrorDialog() {
-        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))
-                .setCancelable(false)
-                .setPositiveButton(getResources().getString(R.string.setup_error_configure_button), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        startActivityForResult(new Intent(Dashboard.this, ProviderListActivity.class), REQUEST_CODE_CONFIGURE_LEAP);
-                    }
-                })
-                .setNegativeButton(getResources().getString(R.string.setup_error_close_button), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        preferences.edit().remove(Provider.KEY).remove(PROVIDER_CONFIGURED).apply();
-                        finish();
-                    }
-                })
-                .show();
-    }
-
-    /**
-     * Inflates permanent UI elements of the View and contains logic for what
-     * service dependent UI elements to include.
-     */
-    //TODO: REFACTOR ME! Consider implementing a manager that handles most of EipFragment's logic about handling EIP commands.
-    //This way, we could avoid to create UI elements (like fragmentManager.replace(R.id.servicesCollection, eip_fragment, EipFragment.TAG); )
-    // just to start services and destroy them afterwards
-    private void buildDashboard(boolean hideAndTurnOnEipOnBoot) {
-        setContentView(R.layout.dashboard);
-
-        provider_name.setText(provider.getDomain());
-
-        user_status_fragment = new UserStatusFragment();
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(Provider.ALLOW_REGISTRATION, provider.allowsRegistration());
-        user_status_fragment.setArguments(bundle);
-        fragment_manager.replace(R.id.user_status_fragment, user_status_fragment, UserStatusFragment.TAG);
-
-//        if (provider.hasEIP()) {
-//            fragment_manager.removePreviousFragment(EipFragment.TAG);
-//            eip_fragment = prepareEipFragment(hideAndTurnOnEipOnBoot);
-//            fragment_manager.replace(R.id.servicesCollection, eip_fragment, EipFragment.TAG);
-//            if (hideAndTurnOnEipOnBoot) {
-//                onBackPressed();
-//            }
-//        }
-    }
-
-    /**
-     *
-     * @param hideAndTurnOnEipOnBoot Flag that indicates if system intent android.intent.action.BOOT_COMPLETED
-     *                               has caused to start Dashboard
-     * @return the created VPNFragment
-     */
-    public EipFragment prepareEipFragment(boolean hideAndTurnOnEipOnBoot) {
-        EipFragment eip_fragment = new EipFragment();
-
-        if (hideAndTurnOnEipOnBoot && !isAlwaysOn()) {
-            preferences.edit().remove(EIP_RESTART_ON_BOOT).apply();
-            Bundle arguments = new Bundle();
-            arguments.putBoolean(EipFragment.START_EIP_ON_BOOT, true);
-            Log.d(TAG, "set START_EIP_ON_BOOT argument for eip_fragment");
-            eip_fragment.setArguments(arguments);
-
-        }
-        return eip_fragment;
-    }
-
-    /**
-     * checks if Android's VPN feature 'always-on' is enabled for Bitmask
-     * @return true if 'always-on' is enabled false if not
-     */
-    private boolean isAlwaysOn() {
-        return  preferences.getBoolean(EIP_IS_ALWAYS_ON, false);
-    }
-
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (provider.allowsRegistration()) {
-            menu.findItem(R.id.signup_button).setVisible(true);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.client_dashboard, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.about_leap:
-                showAbout();
-                return true;
-            case R.id.log_window:
-                showLog();
-                return true;
-            case R.id.switch_provider:
-                if (User.loggedIn()) user_status_fragment.logOut();
-                else switchProvider();
-                return true;
-            case R.id.signup_button:
-                //sessionDialog(Bundle.EMPTY);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    public void showAbout() {
-        Intent intent = new Intent(this, AboutFragment.class);
-        startActivity(intent);
-    }
-
-    public void showLog() {
-        LogWindowWrapper log_window_wrapper = LogWindowWrapper.getInstance(this);
-        log_window_wrapper.showLog();
-    }
-
-    private void switchProvider() {
-//        if (provider.hasEIP()) eip_fragment.stopEipIfPossible();
-
-        ConfigHelper.clearDataOfLastProvider(preferences);
-
-        startActivityForResult(new Intent(this, ProviderListActivity.class), REQUEST_CODE_SWITCH_PROVIDER);
-    }
-
-    public static Provider getProvider() { return provider; }
-
-    @Override
-    public void startActivityForResult(Intent intent, int requestCode) {
-        intent.putExtra(REQUEST_CODE_KEY, requestCode);
-        super.startActivityForResult(intent, requestCode);
-    }
-
-    public void invalidateOptionsMenuOnUiThread() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                invalidateOptionsMenu();
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/se/leap/bitmaskclient/LogWindowWrapper.java b/app/src/main/java/se/leap/bitmaskclient/LogWindowWrapper.java
deleted file mode 100644
index 2476f6a4..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/LogWindowWrapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package se.leap.bitmaskclient;
-
-import android.content.*;
-
-import de.blinkt.openvpn.activities.*;
-
-public class LogWindowWrapper {
-    private static LogWindowWrapper instance;
-
-    private static String TAG = LogWindowWrapper.class.getName();
-    private Context context;
-
-    public LogWindowWrapper(Context context) {
-        this.context = context;
-    }
-
-    public void showLog() {
-        Intent startLW = new Intent(context, LogWindow.class);
-        startLW.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(startLW);
-    }
-
-    public static LogWindowWrapper getInstance(Context context) {
-        if(instance == null)
-            instance = new LogWindowWrapper(context);
-        return instance;
-    }
-}
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index 6d9d32b5..2a2a68a7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -35,6 +35,7 @@ import se.leap.bitmaskclient.drawer.NavigationDrawerFragment;
 import se.leap.bitmaskclient.eip.EipCommand;
 import se.leap.bitmaskclient.eip.EipStatus;
 import se.leap.bitmaskclient.eip.VoidVpnService;
+import se.leap.bitmaskclient.fragments.LogFragment;
 
 import static android.content.Intent.CATEGORY_DEFAULT;
 import static se.leap.bitmaskclient.Constants.BROADCAST_EIP_EVENT;
@@ -97,6 +98,7 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct
     };
 
     public final static String ACTION_SHOW_VPN_FRAGMENT = "action_show_vpn_fragment";
+    public final static String ACTION_SHOW_LOG_FRAGMENT = "action_show_log_fragment";
 
     /**
      * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
@@ -189,6 +191,9 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct
                 bundle.putParcelable(PROVIDER_KEY, provider);
                 fragment.setArguments(bundle);
                 break;
+            case ACTION_SHOW_LOG_FRAGMENT:
+                fragment = new LogFragment();
+                break;
             default:
                 break;
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
index 9d5d4341..772140b0 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -26,6 +26,7 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import se.leap.bitmaskclient.ConfigHelper;
+import se.leap.bitmaskclient.Provider;
 import se.leap.bitmaskclient.ProviderListActivity;
 import se.leap.bitmaskclient.EipFragment;
 import se.leap.bitmaskclient.R;
@@ -34,6 +35,7 @@ import se.leap.bitmaskclient.fragments.LogFragment;
 
 import static android.content.Context.MODE_PRIVATE;
 import static se.leap.bitmaskclient.BitmaskApp.getRefWatcher;
+import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.Constants.REQUEST_CODE_SWITCH_PROVIDER;
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 
@@ -278,6 +280,10 @@ public class NavigationDrawerFragment extends Fragment {
         if (parent == mDrawerAccountsListView) {
             mTitle = getString(R.string.vpn_fragment_title);
             fragment = new EipFragment();
+            Bundle arguments = new Bundle();
+            Provider currentProvider = ConfigHelper.getSavedProviderFromSharedPreferences(preferences);
+            arguments.putParcelable(PROVIDER_KEY, currentProvider);
+            fragment.setArguments(arguments);
         } else {
             Log.d("Drawer", String.format("Selected position %d", position));
             switch (position) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java b/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java
index 3d85b4ad..03e0669a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/fragments/LogFragment.java
@@ -63,7 +63,6 @@ import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus;
 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;
@@ -427,29 +426,8 @@ 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) {
-            // 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);
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java
deleted file mode 100644
index d1c56dee..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/FabButton.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package se.leap.bitmaskclient.userstatus;
-
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import mbanje.kurt.fabbutton.CircleImageView;
-import se.leap.bitmaskclient.R;
-
-public class FabButton extends mbanje.kurt.fabbutton.FabButton {
-
-
-    public FabButton(Context context) {
-        super(context);
-    }
-
-    public FabButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public FabButton(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    private CircleImageView getImage() {
-        return (CircleImageView) findViewById(R.id.fabbutton_circle);
-    }
-}
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
deleted file mode 100644
index 2d8b5c6f..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package se.leap.bitmaskclient.userstatus;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Observable;
-import java.util.Observer;
-
-import butterknife.ButterKnife;
-import butterknife.InjectView;
-import butterknife.OnClick;
-import se.leap.bitmaskclient.Provider;
-import se.leap.bitmaskclient.ProviderAPI;
-import se.leap.bitmaskclient.ProviderAPICommand;
-import se.leap.bitmaskclient.ProviderAPIResultReceiver;
-import se.leap.bitmaskclient.R;
-
-public class UserStatusFragment extends Fragment implements Observer {
-
-    public final static String TAG = UserStatusFragment.class.getSimpleName();
-    private ProviderAPIResultReceiver providerAPI_result_receiver;
-
-    private Provider provider;
-
-    @InjectView(R.id.user_status_username)
-    TextView username;
-    @InjectView(R.id.user_status_icon)
-    FabButton icon;
-    @InjectView(R.id.user_status_button)
-    Button button;
-
-    private UserStatus status;
-    private boolean allowsRegistration = false;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        status = UserStatus.getInstance(getResources());
-        status.addObserver(this);
-    }
-
-    @Override
-    public void onSaveInstanceState(@NotNull Bundle outState) {
-        if (username != null && username.getVisibility() == TextView.VISIBLE)
-            outState.putSerializable(UserStatus.TAG, status.sessionStatus());
-
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.user_session_fragment, container, false);
-        ButterKnife.inject(this, view);
-
-        Bundle arguments = getArguments();
-        allowsRegistration = arguments.getBoolean(Provider.ALLOW_REGISTRATION);
-        handleNewStatus(status);
-
-        return view;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-    }
-
-    public void restoreSessionStatus(Bundle savedInstanceState) {
-        if (savedInstanceState != null)
-            if (savedInstanceState.containsKey(UserStatus.TAG)) {
-                UserStatus.SessionStatus status = (UserStatus.SessionStatus) savedInstanceState.getSerializable(UserStatus.TAG);
-                UserStatus.updateStatus(status, getResources());
-            }
-    }
-
-    @OnClick(R.id.user_status_button)
-    public void handleButton() {
-        android.util.Log.d(TAG, status.toString());
-        if(status.isLoggedIn())
-            logOut();
-        else if(status.isLoggedOut())
-            Log.w(TAG, "implement login from here?");
-            //MainActivity.sessionDialog(Bundle.EMPTY);
-        else if(status.inProgress())
-            cancelLoginOrSignup();
-    }
-
-    @Override
-    public void update(Observable observable, Object data) {
-        if (observable instanceof UserStatus) {
-            final UserStatus status = (UserStatus) observable;
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    handleNewStatus(status);
-                }
-            });
-        }
-    }
-
-    private void handleNewStatus(UserStatus status) {
-        this.status = status;
-        if (allowsRegistration) {
-            if (this.status.inProgress())
-                showUserSessionProgressBar();
-            else
-                hideUserSessionProgressBar();
-            changeMessage();
-            updateButton();
-        }
-    }
-
-    private void showUserSessionProgressBar() {
-        icon.showProgress(true);
-    }
-
-    private void hideUserSessionProgressBar() {
-        icon.showProgress(false);
-    }
-
-    private void changeMessage() {
-        final String message = User.userName();
-        username.setText(message);
-    }
-
-    private void updateButton() {
-        if(status.isLoggedIn() || status.didntLogOut())
-            button.setText(getActivity().getString(R.string.logout_button));
-        else if(allowsRegistration) {
-            if (status.isLoggedOut() || status.notLoggedIn())
-                button.setText(getActivity().getString(R.string.login_button));
-            else if (status.inProgress())
-                button.setText(getActivity().getString(android.R.string.cancel));
-        }
-    }
-
-
-    public void logOut() {
-        android.util.Log.d(TAG, "Log out");
-        ProviderAPICommand.execute(getActivity(), ProviderAPI.LOG_OUT, provider, providerAPI_result_receiver);
-    }
-
-    public void cancelLoginOrSignup() {
-        //EipStatus.getInstance().setConnectedOrDisconnected();
-    }
-
-}