Copy necessary activities and fragments.

Now we need to decide what's our relationship with LogWindow and
LaunchVPN, refactor its classes and fix ours so that we use the
currently supported methods.

5 files changed, 0 insertions, 1281 deletions

diff --git a/app/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/app/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
deleted file mode 100644
index 2cb79e05..00000000
--- a/app/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
+++ /dev/null
@@ -1,639 +0,0 @@
-
-package de.blinkt.openvpn.activities;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.Environment;
-import android.provider.OpenableColumns;
-import android.security.KeyChain;
-import android.security.KeyChainAliasCallback;
-import android.text.TextUtils;
-import android.util.Base64;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import junit.framework.Assert;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.ConfigParser;
-import de.blinkt.openvpn.core.ConfigParser.ConfigParseError;
-import de.blinkt.openvpn.core.ProfileManager;
-import de.blinkt.openvpn.fragments.Utils;
-import de.blinkt.openvpn.views.FileSelectLayout;
-
-import static de.blinkt.openvpn.views.FileSelectLayout.FileSelectCallback;
-
-public class ConfigConverter extends Activity implements FileSelectCallback {
-
-    public static final String IMPORT_PROFILE = "de.blinkt.openvpn.IMPORT_PROFILE";
-    private static final int RESULT_INSTALLPKCS12 = 7;
-    private static final int CHOOSE_FILE_OFFSET = 1000;
-    public static final String VPNPROFILE = "vpnProfile";
-
-    private VpnProfile mResult;
-    
-    private transient List<String> mPathsegments;
-
-    private String mAliasName = null;
-
-
-    private Map<Utils.FileType, FileSelectLayout> fileSelectMap = new HashMap<Utils.FileType, FileSelectLayout>();
-    private String mEmbeddedPwFile;
-    private Vector<String> mLogEntries = new Vector<String>();
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.cancel) {
-            setResult(Activity.RESULT_CANCELED);
-            finish();
-        } else if (item.getItemId() == R.id.ok) {
-            if (mResult == null) {
-                log("Importing the config had error, cannot save it");
-                return true;
-            }
-
-            Intent in = installPKCS12();
-
-            if (in != null)
-                startActivityForResult(in, RESULT_INSTALLPKCS12);
-            else
-                saveProfile();
-
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NotNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (mResult != null)
-            outState.putSerializable(VPNPROFILE, mResult);
-        outState.putString("mAliasName", mAliasName);
-
-
-
-        String[] logentries = mLogEntries.toArray(new String[mLogEntries.size()]);
-
-        outState.putStringArray("logentries", logentries);
-
-        int[] fileselects = new int[fileSelectMap.size()];
-        int k = 0;
-        for (Utils.FileType key : fileSelectMap.keySet()) {
-            fileselects[k] = key.getValue();
-            k++;
-        }
-        outState.putIntArray("fileselects", fileselects);
-        outState.putString("pwfile",mEmbeddedPwFile);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent result) {
-        if (requestCode == RESULT_INSTALLPKCS12 && resultCode == Activity.RESULT_OK) {
-            showCertDialog();
-        }
-
-        if (resultCode == Activity.RESULT_OK && requestCode >= CHOOSE_FILE_OFFSET) {
-            Utils.FileType type = Utils.FileType.getFileTypeByValue(requestCode - CHOOSE_FILE_OFFSET);
-
-
-            FileSelectLayout fs = fileSelectMap.get(type);
-            fs.parseResponse(result, this);
-
-            String data = fs.getData();
-
-            switch (type) {
-                case USERPW_FILE:
-                    mEmbeddedPwFile = data;
-                    break;
-                case PKCS12:
-                    mResult.mPKCS12Filename = data;
-                    break;
-                case TLS_AUTH_FILE:
-                    mResult.mTLSAuthFilename = data;
-                    break;
-                case CA_CERTIFICATE:
-                    mResult.mCaFilename = data;
-                    break;
-                case CLIENT_CERTIFICATE:
-                    mResult.mClientCertFilename = data;
-                    break;
-                case KEYFILE:
-                    mResult.mClientKeyFilename = data;
-                    break;
-                default:
-                    Assert.fail();
-            }
-        }
-
-        super.onActivityResult(requestCode, resultCode, result);
-    }
-
-    private void saveProfile() {
-        Intent result = new Intent();
-        ProfileManager vpl = ProfileManager.getInstance(this);
-
-        if (!TextUtils.isEmpty(mEmbeddedPwFile))
-            ConfigParser.useEmbbedUserAuth(mResult, mEmbeddedPwFile);
-
-        vpl.addProfile(mResult);
-        vpl.saveProfile(this, mResult);
-        vpl.saveProfileList(this);
-        result.putExtra(VpnProfile.EXTRA_PROFILEUUID, mResult.getUUID().toString());
-        setResult(Activity.RESULT_OK, result);
-        finish();
-    }
-
-    public void showCertDialog() {
-        try {
-            KeyChain.choosePrivateKeyAlias(this,
-                    new KeyChainAliasCallback() {
-
-                        public void alias(String alias) {
-                            // Credential alias selected.  Remember the alias selection for future use.
-                            mResult.mAlias = alias;
-                            saveProfile();
-                        }
-
-
-                    },
-                    new String[]{"RSA"}, // List of acceptable key types. null for any
-                    null,                        // issuer, null for any
-                    mResult.mServerName,      // host name of server requesting the cert, null if unavailable
-                    -1,                         // port of server requesting the cert, -1 if unavailable
-                    mAliasName);                       // alias to preselect, null if unavailable
-        } catch (ActivityNotFoundException anf) {
-            Builder ab = new AlertDialog.Builder(this);
-            ab.setTitle(R.string.broken_image_cert_title);
-            ab.setMessage(R.string.broken_image_cert);
-            ab.setPositiveButton(android.R.string.ok, null);
-            ab.show();
-        }
-    }
-
-
-    private Intent installPKCS12() {
-
-        if (!((CheckBox) findViewById(R.id.importpkcs12)).isChecked()) {
-            setAuthTypeToEmbeddedPKCS12();
-            return null;
-
-        }
-        String pkcs12datastr = mResult.mPKCS12Filename;
-        if (VpnProfile.isEmbedded(pkcs12datastr)) {
-            Intent inkeyIntent = KeyChain.createInstallIntent();
-
-            pkcs12datastr = VpnProfile.getEmbeddedContent(pkcs12datastr);
-
-
-            byte[] pkcs12data = Base64.decode(pkcs12datastr, Base64.DEFAULT);
-
-
-            inkeyIntent.putExtra(KeyChain.EXTRA_PKCS12, pkcs12data);
-
-            if (mAliasName.equals(""))
-                mAliasName = null;
-
-            if (mAliasName != null) {
-                inkeyIntent.putExtra(KeyChain.EXTRA_NAME, mAliasName);
-            }
-            return inkeyIntent;
-
-        }
-        return null;
-    }
-
-
-    private void setAuthTypeToEmbeddedPKCS12() {
-        if (VpnProfile.isEmbedded(mResult.mPKCS12Filename)) {
-            if (mResult.mAuthenticationType == VpnProfile.TYPE_USERPASS_KEYSTORE)
-                mResult.mAuthenticationType = VpnProfile.TYPE_USERPASS_PKCS12;
-
-            if (mResult.mAuthenticationType == VpnProfile.TYPE_KEYSTORE)
-                mResult.mAuthenticationType = VpnProfile.TYPE_PKCS12;
-
-        }
-    }
-
-
-    private String getUniqueProfileName(String possibleName) {
-
-        int i = 0;
-
-        ProfileManager vpl = ProfileManager.getInstance(this);
-
-        String newname = possibleName;
-
-        // 	Default to
-        if (mResult.mName != null && !ConfigParser.CONVERTED_PROFILE.equals(mResult.mName))
-            newname = mResult.mName;
-
-        while (newname == null || vpl.getProfileByName(newname) != null) {
-            i++;
-            if (i == 1)
-                newname = getString(R.string.converted_profile);
-            else
-                newname = getString(R.string.converted_profile_i, i);
-        }
-
-        return newname;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.import_menu, menu);
-        return true;
-    }
-
-    private String embedFile(String filename, Utils.FileType type) {
-        if (filename == null)
-            return null;
-
-        // Already embedded, nothing to do
-        if (VpnProfile.isEmbedded(filename))
-            return filename;
-
-        File possibleFile = findFile(filename, type);
-        if (possibleFile == null)
-            return filename;
-        else
-            return readFileContent(possibleFile, type == Utils.FileType.PKCS12);
-
-    }
-
-    private File findFile(String filename, Utils.FileType fileType) {
-        File foundfile = findFileRaw(filename);
-
-        if (foundfile == null && filename != null && !filename.equals("")) {
-            log(R.string.import_could_not_open, filename);
-            addFileSelectDialog(fileType);
-        }
-
-
-        return foundfile;
-    }
-
-    private void addFileSelectDialog(Utils.FileType type) {
-        int titleRes = 0;
-        String value = null;
-        switch (type) {
-            case KEYFILE:
-                titleRes = R.string.client_key_title;
-                if (mResult != null)
-                    value = mResult.mClientKeyFilename;
-                break;
-            case CLIENT_CERTIFICATE:
-                titleRes = R.string.client_certificate_title;
-                if (mResult != null)
-                    value = mResult.mClientCertFilename;
-                break;
-            case CA_CERTIFICATE:
-                titleRes = R.string.ca_title;
-                if (mResult != null)
-                    value = mResult.mCaFilename;
-                break;
-            case TLS_AUTH_FILE:
-                titleRes = R.string.tls_auth_file;
-                if (mResult != null)
-                    value = mResult.mTLSAuthFilename;
-                break;
-            case PKCS12:
-                titleRes = R.string.client_pkcs12_title;
-                if (mResult != null)
-                    value = mResult.mPKCS12Filename;
-                break;
-
-            case USERPW_FILE:
-                titleRes = R.string.userpw_file;
-                value = mEmbeddedPwFile;
-                break;
-
-        }
-
-        boolean isCert = type == Utils.FileType.CA_CERTIFICATE || type == Utils.FileType.CLIENT_CERTIFICATE;
-        FileSelectLayout fl = new FileSelectLayout(this, getString(titleRes), isCert);
-        fileSelectMap.put(type, fl);
-        fl.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        ((LinearLayout) findViewById(R.id.config_convert_root)).addView(fl, 2);
-        findViewById(R.id.files_missing_hint).setVisibility(View.VISIBLE);
-        fl.setData(value, this);
-        int i = getFileLayoutOffset(type);
-        fl.setCaller(this, i, type);
-
-    }
-
-    private int getFileLayoutOffset(Utils.FileType type) {
-        return CHOOSE_FILE_OFFSET + type.getValue();
-    }
-
-
-    private File findFileRaw(String filename) {
-        if (filename == null || filename.equals(""))
-            return null;
-
-        // Try diffent path relative to /mnt/sdcard
-        File sdcard = Environment.getExternalStorageDirectory();
-        File root = new File("/");
-
-        HashSet<File> dirlist = new HashSet<File>();
-
-        for (int i = mPathsegments.size() - 1; i >= 0; i--) {
-            String path = "";
-            for (int j = 0; j <= i; j++) {
-                path += "/" + mPathsegments.get(j);
-            }
-            // Do a little hackish dance for the Android File Importer
-            // /document/primary:ovpn/openvpn-imt.conf
-
-
-            if (path.indexOf(':') != -1 && path.indexOf('/') > path.indexOf(':')) {
-                String possibleDir = path.substring(path.indexOf(':') + 1, path.length());
-                possibleDir = possibleDir.substring(0, possibleDir.lastIndexOf('/'));
-
-
-                dirlist.add(new File(sdcard, possibleDir));
-
-            }
-            dirlist.add(new File(path));
-
-
-        }
-        dirlist.add(sdcard);
-        dirlist.add(root);
-
-
-        String[] fileparts = filename.split("/");
-        for (File rootdir : dirlist) {
-            String suffix = "";
-            for (int i = fileparts.length - 1; i >= 0; i--) {
-                if (i == fileparts.length - 1)
-                    suffix = fileparts[i];
-                else
-                    suffix = fileparts[i] + "/" + suffix;
-
-                File possibleFile = new File(rootdir, suffix);
-                if (!possibleFile.canRead())
-                    continue;
-
-                // read the file inline
-                return possibleFile;
-
-            }
-        }
-        return null;
-    }
-
-    String readFileContent(File possibleFile, boolean base64encode) {
-        byte[] filedata;
-        try {
-            filedata = readBytesFromFile(possibleFile);
-        } catch (IOException e) {
-            log(e.getLocalizedMessage());
-            return null;
-        }
-
-        String data;
-        if (base64encode) {
-            data = Base64.encodeToString(filedata, Base64.DEFAULT);
-        } else {
-            data = new String(filedata);
-
-        }
-
-        return VpnProfile.DISPLAYNAME_TAG + possibleFile.getName() + VpnProfile.INLINE_TAG + data;
-
-    }
-
-
-    private byte[] readBytesFromFile(File file) throws IOException {
-        InputStream input = new FileInputStream(file);
-
-        long len = file.length();
-        if (len > VpnProfile.MAX_EMBED_FILE_SIZE)
-            throw new IOException("File size of file to import too large.");
-
-        // Create the byte array to hold the data
-        byte[] bytes = new byte[(int) len];
-
-        // Read in the bytes
-        int offset = 0;
-        int bytesRead;
-        while (offset < bytes.length
-                && (bytesRead = input.read(bytes, offset, bytes.length - offset)) >= 0) {
-            offset += bytesRead;
-        }
-
-        input.close();
-        return bytes;
-    }
-
-    void embedFiles() {
-        // This where I would like to have a c++ style
-        // void embedFile(std::string & option)
-
-        if (mResult.mPKCS12Filename != null) {
-            File pkcs12file = findFileRaw(mResult.mPKCS12Filename);
-            if (pkcs12file != null) {
-                mAliasName = pkcs12file.getName().replace(".p12", "");
-            } else {
-                mAliasName = "Imported PKCS12";
-            }
-        }
-
-
-        mResult.mCaFilename = embedFile(mResult.mCaFilename, Utils.FileType.CA_CERTIFICATE);
-        mResult.mClientCertFilename = embedFile(mResult.mClientCertFilename, Utils.FileType.CLIENT_CERTIFICATE);
-        mResult.mClientKeyFilename = embedFile(mResult.mClientKeyFilename, Utils.FileType.KEYFILE);
-        mResult.mTLSAuthFilename = embedFile(mResult.mTLSAuthFilename, Utils.FileType.TLS_AUTH_FILE);
-        mResult.mPKCS12Filename = embedFile(mResult.mPKCS12Filename, Utils.FileType.PKCS12);
-        mEmbeddedPwFile = embedFile(mResult.mPassword, Utils.FileType.USERPW_FILE);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-        setContentView(R.layout.config_converter);
-        super.onCreate(savedInstanceState);
-
-        if (savedInstanceState != null && savedInstanceState.containsKey(VPNPROFILE)) {
-            mResult = (VpnProfile) savedInstanceState.getSerializable(VPNPROFILE);
-            mAliasName = savedInstanceState.getString("mAliasName");
-            mEmbeddedPwFile = savedInstanceState.getString("pwfile");
-
-            if (savedInstanceState.containsKey("logentries")) {
-                //noinspection ConstantConditions
-                for (String logItem : savedInstanceState.getStringArray("logentries"))
-                    log(logItem);
-            }
-            if (savedInstanceState.containsKey("fileselects")) {
-                //noinspection ConstantConditions
-                for (int k : savedInstanceState.getIntArray("fileselects")) {
-                    addFileSelectDialog(Utils.FileType.getFileTypeByValue(k));
-                }
-            }
-            return;
-        }
-
-
-        final android.content.Intent intent = getIntent();
-
-        if (intent != null) {
-            final android.net.Uri data = intent.getData();
-            if (data != null) {
-                //log(R.string.import_experimental);
-                log(R.string.importing_config, data.toString());
-                try {
-                    String possibleName = null;
-                    if ((data.getScheme() != null && data.getScheme().equals("file")) ||
-                            (data.getLastPathSegment() != null &&
-                                    (data.getLastPathSegment().endsWith(".ovpn") ||
-                                            data.getLastPathSegment().endsWith(".conf")))
-                            ) {
-                        possibleName = data.getLastPathSegment();
-                        if (possibleName.lastIndexOf('/') != -1)
-                            possibleName = possibleName.substring(possibleName.lastIndexOf('/') + 1);
-
-                    }
-                    InputStream is = getContentResolver().openInputStream(data);
-                    mPathsegments = data.getPathSegments();
-
-                    Cursor cursor = null;
-                    if (data!=null)
-                         cursor = getContentResolver().query(data, null, null, null, null);
-
-
-                    try {
-
-
-                        if (cursor!=null && cursor.moveToFirst()) {
-                            int columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-
-                            if (columnIndex != -1) {
-                                String displayName = cursor.getString(columnIndex);
-                                if (displayName != null)
-                                    possibleName = displayName;
-                            }
-                            columnIndex = cursor.getColumnIndex("mime_type");
-                            if (columnIndex != -1) {
-                                log("Opening Mime TYPE: " + cursor.getString(columnIndex));
-                            }
-                        }
-                    } finally {
-                        if(cursor!=null)
-                            cursor.close();
-                    }
-                    if (possibleName != null) {
-                        possibleName = possibleName.replace(".ovpn", "");
-                        possibleName = possibleName.replace(".conf", "");
-                    }
-
-                    doImport(is, possibleName);
-
-                } catch (FileNotFoundException e) {
-                    log(R.string.import_content_resolve_error);
-                }
-            }
-
-            // We parsed the intent, relay on saved instance for restoring
-            setIntent(null);
-        }
-
-
-    }
-
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-
-
-    }
-
-    private void log(String logmessage) {
-        mLogEntries.add(logmessage);
-        TextView tv = new TextView(this);
-        tv.setText(logmessage);
-        LinearLayout logLayout = (LinearLayout) findViewById(R.id.config_convert_root);
-        logLayout.addView(tv);
-    }
-
-    private void doImport(InputStream is, String newName) {
-        ConfigParser cp = new ConfigParser();
-        try {
-            InputStreamReader isr = new InputStreamReader(is);
-
-            cp.parseConfig(isr);
-            mResult = cp.convertProfile();
-            embedFiles();
-            displayWarnings();
-            mResult.mName = getUniqueProfileName(newName);
-
-            log(R.string.import_done);
-            return;
-
-        } catch (IOException e) {
-            log(R.string.error_reading_config_file);
-            log(e.getLocalizedMessage());
-        } catch (ConfigParseError e) {
-            log(R.string.error_reading_config_file);
-            log(e.getLocalizedMessage());
-        }
-        mResult = null;
-
-    }
-
-    private void displayWarnings() {
-        if (mResult.mUseCustomConfig) {
-            log(R.string.import_warning_custom_options);
-            String copt = mResult.mCustomConfigOptions;
-            if (copt.startsWith("#")) {
-                int until = copt.indexOf('\n');
-                copt = copt.substring(until + 1);
-            }
-
-            log(copt);
-        }
-
-        if (mResult.mAuthenticationType == VpnProfile.TYPE_KEYSTORE ||
-                mResult.mAuthenticationType == VpnProfile.TYPE_USERPASS_KEYSTORE) {
-            findViewById(R.id.importpkcs12).setVisibility(View.VISIBLE);
-        }
-
-    }
-
-    private void log(int ressourceId, Object... formatArgs) {
-        log(getString(ressourceId, formatArgs));
-    }
-
-
-}
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java b/app/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
deleted file mode 100644
index 590b7150..00000000
--- a/app/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package de.blinkt.openvpn.activities;
-
-import android.app.ListActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import de.blinkt.openvpn.LaunchVPN;
-import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.ProfileManager;
-
-import java.util.Collection;
-import java.util.Vector;
-
-/**
- * This Activity actually handles two stages of a launcher shortcut's life cycle.
- *
- * 1. Your application offers to provide shortcuts to the launcher.  When
- *    the user installs a shortcut, an activity within your application
- *    generates the actual shortcut and returns it to the launcher, where it
- *    is shown to the user as an icon.
- *
- * 2. Any time the user clicks on an installed shortcut, an intent is sent.
- *    Typically this would then be handled as necessary by an activity within
- *    your application.
- *
- * We handle stage 1 (creating a shortcut) by simply sending back the information (in the form
- * of an {@link android.content.Intent} that the launcher will use to create the shortcut.
- *
- * You can also implement this in an interactive way, by having your activity actually present
- * UI for the user to select the specific nature of the shortcut, such as a contact, picture, URL,
- * media item, or action.
- *
- * We handle stage 2 (responding to a shortcut) in this sample by simply displaying the contents
- * of the incoming {@link android.content.Intent}.
- *
- * In a real application, you would probably use the shortcut intent to display specific content
- * or start a particular operation.
- */
-public class CreateShortcuts extends ListActivity implements OnItemClickListener {
-
-
-    private static final int START_VPN_PROFILE= 70;
-
-
-    private ProfileManager mPM;
-    private VpnProfile mSelectedProfile;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mPM =ProfileManager.getInstance(this);
-
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        // Resolve the intent
-
-            createListView();
-    }
-
-    private void createListView() {
-        ListView lv = getListView();
-        //lv.setTextFilterEnabled(true);
-
-        Collection<VpnProfile> vpnList = mPM.getProfiles();
-
-        Vector<String> vpnNames=new Vector<String>();
-        for (VpnProfile vpnProfile : vpnList) {
-            vpnNames.add(vpnProfile.mName);
-        }
-
-
-
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_list_item_1,vpnNames);
-        lv.setAdapter(adapter);
-
-        lv.setOnItemClickListener(this);
-    }
-
-    /**
-     * This function creates a shortcut and returns it to the caller.  There are actually two
-     * intents that you will send back.
-     *
-     * The first intent serves as a container for the shortcut and is returned to the launcher by
-     * setResult().  This intent must contain three fields:
-     *
-     * <ul>
-     * <li>{@link android.content.Intent#EXTRA_SHORTCUT_INTENT} The shortcut intent.</li>
-     * <li>{@link android.content.Intent#EXTRA_SHORTCUT_NAME} The text that will be displayed with
-     * the shortcut.</li>
-     * <li>{@link android.content.Intent#EXTRA_SHORTCUT_ICON} The shortcut's icon, if provided as a
-     * bitmap, <i>or</i> {@link android.content.Intent#EXTRA_SHORTCUT_ICON_RESOURCE} if provided as
-     * a drawable resource.</li>
-     * </ul>
-     *
-     * If you use a simple drawable resource, note that you must wrapper it using
-     * {@link android.content.Intent.ShortcutIconResource}, as shown below.  This is required so
-     * that the launcher can access resources that are stored in your application's .apk file.  If
-     * you return a bitmap, such as a thumbnail, you can simply put the bitmap into the extras
-     * bundle using {@link android.content.Intent#EXTRA_SHORTCUT_ICON}.
-     *
-     * The shortcut intent can be any intent that you wish the launcher to send, when the user
-     * clicks on the shortcut.  Typically this will be {@link android.content.Intent#ACTION_VIEW}
-     * with an appropriate Uri for your content, but any Intent will work here as long as it
-     * triggers the desired action within your Activity.
-     * @param profile
-     */
-    private void setupShortcut(VpnProfile profile) {
-        // First, set up the shortcut intent.  For this example, we simply create an intent that
-        // will bring us directly back to this activity.  A more typical implementation would use a
-        // data Uri in order to display a more specific result, or a custom action in order to
-        // launch a specific operation.
-
-        Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
-        shortcutIntent.setClass(this, LaunchVPN.class);
-        shortcutIntent.putExtra(LaunchVPN.EXTRA_KEY,profile.getUUID().toString());
-
-        // Then, set up the container intent (the response to the caller)
-
-        Intent intent = new Intent();
-        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, profile.getName());
-        Parcelable iconResource = Intent.ShortcutIconResource.fromContext(
-                this, R.drawable.icon);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
-
-        // Now, return the result to the launcher
-
-        setResult(RESULT_OK, intent);
-    }
-
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position,
-                            long id) {
-        String profileName = ((TextView) view).getText().toString();
-
-        VpnProfile profile = mPM.getProfileByName(profileName);
-
-        setupShortcut(profile);
-        finish();
-    }
-
-}
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/FileSelect.java b/app/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
deleted file mode 100644
index a30b694c..00000000
--- a/app/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package de.blinkt.openvpn.activities;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Base64;
-
-import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.fragments.FileSelectionFragment;
-import de.blinkt.openvpn.fragments.InlineFileTab;
-
-public class FileSelect extends Activity {
-	public static final String RESULT_DATA = "RESULT_PATH";
-	public static final String START_DATA = "START_DATA";
-	public static final String WINDOW_TITLE = "WINDOW_TILE";
-	public static final String NO_INLINE_SELECTION = "de.blinkt.openvpn.NO_INLINE_SELECTION";
-	public static final String SHOW_CLEAR_BUTTON = "de.blinkt.openvpn.SHOW_CLEAR_BUTTON";
-	public static final String DO_BASE64_ENCODE = "de.blinkt.openvpn.BASE64ENCODE";
-	
-	private FileSelectionFragment mFSFragment;
-	private InlineFileTab mInlineFragment;
-	private String mData;
-	private Tab inlineFileTab;
-	private Tab fileExplorerTab;
-	private boolean mNoInline;
-	private boolean mShowClear;
-	private boolean mBase64Encode;
-	
-		
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState); 
-		setContentView(R.layout.file_dialog);
-
-		mData = getIntent().getStringExtra(START_DATA);
-		if(mData==null)
-			mData=Environment.getExternalStorageDirectory().getPath();
-		
-		String title = getIntent().getStringExtra(WINDOW_TITLE);
-		int titleId = getIntent().getIntExtra(WINDOW_TITLE, 0);
-		if(titleId!=0) 
-			title =getString(titleId);
-		if(title!=null)
-			setTitle(title);
-		
-		mNoInline = getIntent().getBooleanExtra(NO_INLINE_SELECTION, false);
-		mShowClear = getIntent().getBooleanExtra(SHOW_CLEAR_BUTTON, false);
-		mBase64Encode = getIntent().getBooleanExtra(DO_BASE64_ENCODE, false);
-		
-		ActionBar bar = getActionBar();
-		bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); 
-		fileExplorerTab = bar.newTab().setText(R.string.file_explorer_tab);
-		inlineFileTab = bar.newTab().setText(R.string.inline_file_tab); 
-
-		mFSFragment = new FileSelectionFragment();
-		fileExplorerTab.setTabListener(new MyTabsListener<FileSelectionFragment>(this, mFSFragment));
-		bar.addTab(fileExplorerTab);
-		
-		if(!mNoInline) {
-			mInlineFragment = new InlineFileTab();
-			inlineFileTab.setTabListener(new MyTabsListener<InlineFileTab>(this, mInlineFragment));
-			bar.addTab(inlineFileTab);
-		} else {
-			mFSFragment.setNoInLine();
-		}
-
-		
-	}
-	
-	public boolean showClear() {
-		if(mData == null || mData.equals(""))
-			return false;
-		else
-			return mShowClear;
-	}
-
-	protected class MyTabsListener<T extends Fragment> implements ActionBar.TabListener
-	{
-		private Fragment mFragment;
-		private boolean mAdded=false;
-
-		public MyTabsListener( Activity activity, Fragment fragment){
-			this.mFragment = fragment;
-		}
-
-		public void onTabSelected(Tab tab, FragmentTransaction ft) {
-			// Check if the fragment is already initialized
-			if (!mAdded) {
-				// If not, instantiate and add it to the activity
-				ft.add(android.R.id.content, mFragment);
-				mAdded =true;
-			} else {
-				// If it exists, simply attach it in order to show it
-				ft.attach(mFragment);
-			}
-		}	        
-
-		@Override
-		public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-			ft.detach(mFragment);
-		}
-
-		@Override
-		public void onTabReselected(Tab tab, FragmentTransaction ft) {
-
-		}
-	}
-	
-	public void importFile(String path) {
-		File ifile = new File(path);
-		Exception fe = null;
-		try {
-
-			String data = "";
-			
-			byte[] fileData = readBytesFromFile(ifile) ;
-			if(mBase64Encode)
-				data += Base64.encodeToString(fileData, Base64.DEFAULT);
-			else
-				data += new String(fileData);
-			
-			mData =data;
-			
-			/*
-			mInlineFragment.setData(data);
-			getActionBar().selectTab(inlineFileTab); */
-			saveInlineData(ifile.getName(), data);
-		} catch (FileNotFoundException e) {
-			fe = e;
-		} catch (IOException e) {
-			fe =e;
-		}
-		if(fe!=null) {
-			Builder ab = new AlertDialog.Builder(this);
-			ab.setTitle(R.string.error_importing_file);
-			ab.setMessage(getString(R.string.import_error_message) + "\n" + fe.getLocalizedMessage());
-			ab.setPositiveButton(android.R.string.ok, null);
-			ab.show();
-		}
-	}
-
-	static private byte[] readBytesFromFile(File file) throws IOException {
-		InputStream input = new FileInputStream(file);
-
-		long len= file.length();
-        if (len > VpnProfile.MAX_EMBED_FILE_SIZE)
-            throw new IOException("selected file size too big to embed into profile");
-
-		// Create the byte array to hold the data
-		byte[] bytes = new byte[(int) len];
-
-		// Read in the bytes
-		int offset = 0;
-		int bytesRead = 0;
-		while (offset < bytes.length
-				&& (bytesRead=input.read(bytes, offset, bytes.length-offset)) >= 0) {
-			offset += bytesRead;
-		}
-
-		input.close();
-		return bytes;
-	}
-	
-	
-	public void setFile(String path) {
-		Intent intent = new Intent();
-		intent.putExtra(RESULT_DATA, path);
-		setResult(Activity.RESULT_OK,intent);
-		finish();		
-	}
-
-	public String getSelectPath() {
-		if(VpnProfile.isEmbedded(mData))
-			return mData;
-		else
-			return Environment.getExternalStorageDirectory().getPath();
-	}
-
-	public CharSequence getInlineData() {
-		if(VpnProfile.isEmbedded(mData))
-			return VpnProfile.getEmbeddedContent(mData);
-		else
-			return "";
-	}
-	
-	public void clearData() {
-		Intent intent = new Intent();
-		intent.putExtra(RESULT_DATA, (String)null);
-		setResult(Activity.RESULT_OK,intent);
-		finish();
-		
-	}
-
-	public void saveInlineData(String fileName, String string) {
-		Intent intent = new Intent();
-
-        if(fileName==null)
-            intent.putExtra(RESULT_DATA, VpnProfile.INLINE_TAG + string);
-        else
-		    intent.putExtra(RESULT_DATA,VpnProfile.DISPLAYNAME_TAG + fileName + VpnProfile.INLINE_TAG + string);
-		setResult(Activity.RESULT_OK, intent);
-		finish();
-		
-	}
-}
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/MainActivity.java b/app/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
deleted file mode 100644
index 26cd0269..00000000
--- a/app/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package de.blinkt.openvpn.activities;
-
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-
-import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.fragments.*;
-
-
-public class MainActivity extends Activity {
-
-	protected void onCreate(android.os.Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		ActionBar bar = getActionBar();
-		bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-
-		Tab vpnListTab = bar.newTab().setText(R.string.vpn_list_title);
-		Tab generalTab = bar.newTab().setText(R.string.generalsettings);
-		Tab faqtab = bar.newTab().setText(R.string.faq);
-		Tab abouttab = bar.newTab().setText(R.string.about);
-
-		vpnListTab.setTabListener(new TabListener<VPNProfileList>("profiles", VPNProfileList.class));
-		generalTab.setTabListener(new TabListener<GeneralSettings>("settings", GeneralSettings.class));
-		faqtab.setTabListener(new TabListener<FaqFragment>("faq", FaqFragment.class));
-		abouttab.setTabListener(new TabListener<AboutFragment>("about", AboutFragment.class));
-
-		bar.addTab(vpnListTab);
-		bar.addTab(generalTab);
-		bar.addTab(faqtab);
-		bar.addTab(abouttab);
-
-        if (false) {
-            Tab logtab = bar.newTab().setText("Log");
-            logtab.setTabListener(new TabListener<LogFragment>("log", LogFragment.class));
-            bar.addTab(logtab);
-        }
-
-        if(SendDumpFragment.getLastestDump(this)!=null) {
-			Tab sendDump = bar.newTab().setText(R.string.crashdump);
-			sendDump.setTabListener(new TabListener<SendDumpFragment>("crashdump",SendDumpFragment.class));
-			bar.addTab(sendDump);
-		}
-		
-	}
-
-	protected class TabListener<T extends Fragment> implements ActionBar.TabListener
-	{
-		private Fragment mFragment;
-		private String mTag;
-		private Class<T> mClass;
-
-        public TabListener(String tag, Class<T> clz) {
-            mTag = tag;
-            mClass = clz;
-
-            // Check to see if we already have a fragment for this tab, probably
-            // from a previously saved state.  If so, deactivate it, because our
-            // initial state is that a tab isn't shown.
-            mFragment = getFragmentManager().findFragmentByTag(mTag);
-            if (mFragment != null && !mFragment.isDetached()) {
-                FragmentTransaction ft = getFragmentManager().beginTransaction();
-                ft.detach(mFragment);
-                ft.commit();
-            }
-        }
-      
-        public void onTabSelected(Tab tab, FragmentTransaction ft) {
-            if (mFragment == null) {
-                mFragment = Fragment.instantiate(MainActivity.this, mClass.getName());
-                ft.add(android.R.id.content, mFragment, mTag);
-            } else {
-                ft.attach(mFragment);
-            }
-        }
-
-        public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-            if (mFragment != null) {
-                ft.detach(mFragment);
-            }
-        }
-
-
-		@Override
-		public void onTabReselected(Tab tab, FragmentTransaction ft) {
-
-		}
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-
-		System.out.println(data);
-
-
-	}
-
-
-}
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java b/app/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
deleted file mode 100644
index 1ee9a5f4..00000000
--- a/app/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package de.blinkt.openvpn.activities;
-
-import java.util.List;
-
-import android.annotation.TargetApi;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import se.leap.bitmaskclient.R;
-import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.ProfileManager;
-import de.blinkt.openvpn.fragments.Settings_Authentication;
-import de.blinkt.openvpn.fragments.Settings_Basic;
-import de.blinkt.openvpn.fragments.Settings_IP;
-import de.blinkt.openvpn.fragments.Settings_Obscure;
-import de.blinkt.openvpn.fragments.Settings_Routing;
-import de.blinkt.openvpn.fragments.ShowConfigFragment;
-import de.blinkt.openvpn.fragments.VPNProfileList;
-
-
-public class VPNPreferences extends PreferenceActivity {
-
-    static final Class validFragments[] = new Class[] {
-        Settings_Authentication.class, Settings_Basic.class, Settings_IP.class,
-            Settings_Obscure.class, Settings_Routing.class, ShowConfigFragment.class
-    };
-
-    private String mProfileUUID;
-	private VpnProfile mProfile;
-
-	public VPNPreferences() {
-		super();
-	}
-
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        for (Class c: validFragments)
-            if (c.getName().equals(fragmentName))
-                return true;
-        return false;
-
-    }
-
-    @Override
-	protected void onStop() {
-		super.onStop();
-	}
-
-	@Override
-	protected void onSaveInstanceState(Bundle outState) {
-		outState.putString(getIntent().getStringExtra(getPackageName() + ".profileUUID"),mProfileUUID);
-		super.onSaveInstanceState(outState);
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		Intent intent = getIntent();
-		
-
-		if(intent!=null) {
-			String profileUUID = intent.getStringExtra(getPackageName() + ".profileUUID");
-			if(profileUUID==null) {
-				Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
-				profileUUID =  initialArguments.getString(getPackageName() + ".profileUUID");
-			}
-			if(profileUUID!=null){
-
-				mProfileUUID = profileUUID;
-				mProfile = ProfileManager.get(this,mProfileUUID);
-
-			}
-		}
-		// When a profile is deleted from a category fragment in hadset mod we need to finish
-		// this activity as well when returning
-		if (mProfile==null || mProfile.profileDleted) {
-			setResult(VPNProfileList.RESULT_VPN_DELETED);
-			finish();
-		}
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		mProfileUUID = getIntent().getStringExtra(getPackageName() + ".profileUUID");
-		if(savedInstanceState!=null){
-			String savedUUID = savedInstanceState.getString(getPackageName() + ".profileUUID");
-			if(savedUUID!=null)
-				mProfileUUID=savedUUID;
-		}
-
-		mProfile = ProfileManager.get(this,mProfileUUID);
-		if(mProfile!=null) {
-			setTitle(getString(R.string.edit_profile_title, mProfile.getName()));
-		}
-		super.onCreate(savedInstanceState);
-	}
-
-
-
-	@Override
-	public void onBuildHeaders(List<Header> target) {
-		loadHeadersFromResource(R.xml.vpn_headers, target); 
-		for (Header header : target) {
-			if(header.fragmentArguments==null)
-				header.fragmentArguments = new Bundle();
-			header.fragmentArguments.putString(getPackageName() + ".profileUUID",mProfileUUID);
-		}
-	}
-
-	@Override
-	public void onBackPressed() {
-		setResult(RESULT_OK, getIntent());
-		super.onBackPressed();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if(item.getItemId() == R.id.remove_vpn)
-			askProfileRemoval();
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-
-		getMenuInflater().inflate(R.menu.vpnpreferences_menu, menu);
-
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	private void askProfileRemoval() {
-		AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-		dialog.setTitle("Confirm deletion");
-		dialog.setMessage(getString(R.string.remove_vpn_query, mProfile.mName));
-
-		dialog.setPositiveButton(android.R.string.yes,
-				new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				removeProfile(mProfile);
-			}
-
-		});
-		dialog.setNegativeButton(android.R.string.no,null);
-		dialog.create().show();
-	}
-	
-	protected void removeProfile(VpnProfile profile) {
-		ProfileManager.getInstance(this).removeProfile(this,profile);
-		setResult(VPNProfileList.RESULT_VPN_DELETED);
-		finish();
-		
-	}
-}
-