Deleted unused classes from ics-openvpn.

This classes were an obvious choice, there may be more unused classes
around there.

Conflicts:
	src/se/leap/bitmaskclient/ProviderListFragment.java

16 files changed, 0 insertions, 2054 deletions

diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java
index 44cf8247..3fddfed5 100644
--- a/src/se/leap/bitmaskclient/Dashboard.java
+++ b/src/se/leap/bitmaskclient/Dashboard.java
@@ -21,7 +21,6 @@ import org.json.JSONObject;
 
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
-import se.leap.openvpn.MainActivity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DialogFragment;
@@ -213,10 +212,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 			intent = new Intent(this, AboutActivity.class);
 			startActivity(intent);
 			return true;
-		case R.id.legacy_interface:
-			intent = new Intent(this,MainActivity.class);
-			startActivity(intent);
-			return true;
 		case R.id.switch_provider:
 			if (Provider.getInstance().hasEIP()){
 				if (ConfigHelper.getBoolFromSharedPref(EIP.AUTHED_EIP)){
diff --git a/src/se/leap/openvpn/FaqFragment.java b/src/se/leap/openvpn/FaqFragment.java
deleted file mode 100644
index dc498087..00000000
--- a/src/se/leap/openvpn/FaqFragment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package se.leap.openvpn;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import se.leap.bitmaskclient.R;
-
-public class FaqFragment extends Fragment  {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-       
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-    		Bundle savedInstanceState) {
-    	View v= inflater.inflate(R.layout.faq, container, false);
-    	
-    	insertHtmlEntry(v,R.id.broken_images_faq,R.string.broken_images_faq);
-    	insertHtmlEntry(v,R.id.faq_howto,R.string.faq_howto);
-    	insertHtmlEntry(v, R.id.baterry_consumption, R.string.baterry_consumption);  
-    	insertHtmlEntry(v, R.id.faq_tethering, R.string.faq_tethering);
-		
-		return v;
-		
-		
-
-    }
-
-	private void insertHtmlEntry (View v, int viewId, int stringId) {
-		TextView faqitem = (TextView) v.findViewById(viewId);
-    	faqitem.setText(Html.fromHtml(getActivity().getString(stringId)));
-    	faqitem.setMovementMethod(LinkMovementMethod.getInstance());
-	}
-
-}
diff --git a/src/se/leap/openvpn/FileProvider.java b/src/se/leap/openvpn/FileProvider.java
deleted file mode 100644
index d2714b2c..00000000
--- a/src/se/leap/openvpn/FileProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package se.leap.openvpn;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import android.content.ContentProvider;
-import android.content.ContentProvider.PipeDataWriter;
-import android.content.ContentValues;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
-import android.provider.OpenableColumns;
-import android.util.Log;
-
-/**
- * A very simple content provider that can serve arbitrary asset files from
- * our .apk.
- */
-public class FileProvider extends ContentProvider
-implements PipeDataWriter<InputStream> {
-	@Override
-	public boolean onCreate() {
-		return true;
-	}
-
-	@Override
-	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-			String sortOrder) {
-		try {
-			File dumpfile = getFileFromURI(uri);
-
-
-			MatrixCursor c = new MatrixCursor(projection);
-
-			Object[] row = new Object[projection.length];
-			int i=0;
-			for (String r:projection) {
-				if(r.equals(OpenableColumns.SIZE))
-					row[i] = dumpfile.length();
-				if(r.equals(OpenableColumns.DISPLAY_NAME))
-					row[i] = dumpfile.getName();
-				i++;
-			}
-			c.addRow(row);
-			return c;
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-			return null;
-		}
-
-
-	}
-
-	@Override
-	public Uri insert(Uri uri, ContentValues values) {
-		// Don't support inserts.
-		return null;
-	}
-
-	@Override
-	public int delete(Uri uri, String selection, String[] selectionArgs) {
-		// Don't support deletes.
-		return 0;
-	}
-
-	@Override
-	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-		// Don't support updates.
-		return 0;
-	}
-
-	@Override
-	public String getType(Uri uri) {
-		// For this sample, assume all files are .apks.
-		return "application/octet-stream";
-	}
-
-	@Override
-	public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
-		File dumpfile = getFileFromURI(uri);
-
-		try {
-
-			InputStream is = new FileInputStream(dumpfile);
-			// Start a new thread that pipes the stream data back to the caller.
-			return new AssetFileDescriptor(
-					openPipeHelper(uri, null, null, is, this), 0,
-					dumpfile.length());
-		} catch (IOException e) {
-			FileNotFoundException fnf = new FileNotFoundException("Unable to open minidump " + uri);
-			throw fnf;
-		}
-	}
-
-	private File getFileFromURI(Uri uri) throws FileNotFoundException {
-		// Try to open an asset with the given name.
-		String path = uri.getPath();
-		if(path.startsWith("/"))
-			path = path.replaceFirst("/", "");       
-
-		// I think this already random enough, no need for magic secure cookies
-		// 1f9563a4-a1f5-2165-255f2219-111823ef.dmp
-		if (!path.matches("^[0-9a-z-.]*(dmp|dmp.log)$"))
-			throw new FileNotFoundException("url not in expect format " + uri);
-		File cachedir = getContext().getCacheDir();
-		File dumpfile = new File(cachedir,path);
-		return dumpfile;
-	}
-
-	@Override
-	public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType,
-			Bundle opts, InputStream args) {
-		// Transfer data from the asset to the pipe the client is reading.
-		byte[] buffer = new byte[8192];
-		int n;
-		FileOutputStream fout = new FileOutputStream(output.getFileDescriptor());
-		try {
-			while ((n=args.read(buffer)) >= 0) {
-				fout.write(buffer, 0, n);
-			}
-		} catch (IOException e) {
-			Log.i("OpenVPNFileProvider", "Failed transferring", e);
-		} finally {
-			try {
-				args.close();
-			} catch (IOException e) {
-			}
-			try {
-				fout.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-}
diff --git a/src/se/leap/openvpn/FileSelect.java b/src/se/leap/openvpn/FileSelect.java
deleted file mode 100644
index 4b88e7a7..00000000
--- a/src/se/leap/openvpn/FileSelect.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package se.leap.openvpn;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import se.leap.bitmaskclient.R;
-
-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;
-
-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 = "se.leap.openvpn.NO_INLINE_SELECTION";
-	public static final String SHOW_CLEAR_BUTTON = "se.leap.openvpn.SHOW_CLEAR_BUTTON";
-	public static final String DO_BASE64_ENCODE = "se.leap.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();
-		}
-
-		
-	}
-	
-	protected 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 =VpnProfile.INLINE_TAG;
-			
-			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);
-		} 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();
-		}
-	}
-
-	private byte[] readBytesFromFile(File file) throws IOException {
-		InputStream input = new FileInputStream(file);
-
-		long len= file.length();
-
-
-		// 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(!mData.startsWith(VpnProfile.INLINE_TAG))
-			return mData;
-		else
-			return Environment.getExternalStorageDirectory().getPath();
-	}
-
-	public CharSequence getInlineData() {
-		if(mData.startsWith(VpnProfile.INLINE_TAG))
-			return mData.substring(VpnProfile.INLINE_TAG.length());
-		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 string) {
-		Intent intent = new Intent();
-		intent.putExtra(RESULT_DATA, string);
-		setResult(Activity.RESULT_OK,intent);
-		finish();
-		
-	}
-}
diff --git a/src/se/leap/openvpn/FileSelectLayout.java b/src/se/leap/openvpn/FileSelectLayout.java
deleted file mode 100644
index ec5f3636..00000000
--- a/src/se/leap/openvpn/FileSelectLayout.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package se.leap.openvpn;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import se.leap.bitmaskclient.R;
-
-
-public class FileSelectLayout extends LinearLayout implements OnClickListener {
-
-	private TextView mDataView;
-	private String mData;
-	private Fragment mFragment;
-	private int mTaskId;
-	private Button mSelectButton;
-	private boolean mBase64Encode;
-	private String mTitle;
-	private boolean mShowClear;
-
-	public FileSelectLayout( Context context,AttributeSet attrset) {
-		super(context,attrset);
-		inflate(getContext(), R.layout.file_select, this);
-		
-		TypedArray ta = context.obtainStyledAttributes(attrset,R.styleable.FileSelectLayout);
-		
-		mTitle = ta.getString(R.styleable.FileSelectLayout_title);
-		
-		TextView tview = (TextView) findViewById(R.id.file_title);
-		tview.setText(mTitle);
-		
-		mDataView = (TextView) findViewById(R.id.file_selected_item);
-		mSelectButton = (Button) findViewById(R.id.file_select_button);
-		mSelectButton.setOnClickListener(this);
-
-	}
-
-	public void setFragment(Fragment fragment, int i)
-	{
-		mTaskId = i;
-		mFragment = fragment;
-	}
-	
-	public void getCertificateFileDialog() {
-		Intent startFC = new Intent(getContext(),FileSelect.class);
-		startFC.putExtra(FileSelect.START_DATA, mData);
-		startFC.putExtra(FileSelect.WINDOW_TITLE,mTitle);
-		if(mBase64Encode)
-			startFC.putExtra(FileSelect.DO_BASE64_ENCODE, true);
-		if(mShowClear)
-			startFC.putExtra(FileSelect.SHOW_CLEAR_BUTTON, true);
-		mFragment.startActivityForResult(startFC,mTaskId);
-	}
-
-	
-	public String getData() {
-		return mData;
-	}
-
-	public void setData(String data) {
-		mData = data;
-		if(data==null) 
-			mDataView.setText(mFragment.getString(R.string.no_data));
-		else if(mData.startsWith(VpnProfile.INLINE_TAG))
-			mDataView.setText(R.string.inline_file_data);
-		else
-			mDataView.setText(data);
-		
-	}
-
-	@Override
-	public void onClick(View v) {
-		if(v == mSelectButton) {
-			getCertificateFileDialog();
-		}
-	}
-
-	public void setBase64Encode() {
-		mBase64Encode =true;
-	}
-
-	public void setShowClear() {
-		mShowClear=true;
-	}
-	
-}
diff --git a/src/se/leap/openvpn/FileSelectionFragment.java b/src/se/leap/openvpn/FileSelectionFragment.java
deleted file mode 100644
index 80cb2c62..00000000
--- a/src/se/leap/openvpn/FileSelectionFragment.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package se.leap.openvpn;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TreeMap;
-
-import se.leap.bitmaskclient.R;
-
-import android.app.AlertDialog;
-import android.app.ListFragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
-
-/**
- * Activity para escolha de arquivos/diretorios.
- * 
- * @author android
- * 
- */
-public class FileSelectionFragment extends ListFragment {
-
-	private static final String ITEM_KEY = "key";
-	private static final String ITEM_IMAGE = "image";
-	private static final String ROOT = "/";
-    
-    
-	private List<String> path = null;
-	private TextView myPath;
-	private ArrayList<HashMap<String, Object>> mList;
-
-	private Button selectButton;
-
-
-	private String parentPath;
-	private String currentPath = ROOT;
-
-
-	private String[] formatFilter = null;
-
-	private File selectedFile;
-	private HashMap<String, Integer> lastPositions = new HashMap<String, Integer>();
-	private String mStartPath;
-	private Button mImportFile;
-	private Button mClearButton;
-	private boolean mHideImport=false;
-
-	
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.file_dialog_main, container,false);
-		
-		myPath = (TextView) v.findViewById(R.id.path);
-
-		selectButton = (Button) v.findViewById(R.id.fdButtonSelect);
-		selectButton.setEnabled(false);
-		selectButton.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				if (selectedFile != null) {
-					((FileSelect) getActivity()).setFile(selectedFile.getPath());
-					
-				}
-			}
-		});
-
-		mClearButton = (Button) v.findViewById(R.id.fdClear);
-		mClearButton.setOnClickListener(new OnClickListener() {
-			
-			@Override
-			public void onClick(View v) {
-				((FileSelect) getActivity()).clearData();
-			}
-		});
-		if(!((FileSelect) getActivity()).showClear()) {
-			mClearButton.setVisibility(View.GONE);
-			mClearButton.setEnabled(false);
-		}
-		
-		
-		mImportFile = (Button) v.findViewById(R.id.importfile);
-		mImportFile.setEnabled(false);
-		mImportFile.setOnClickListener(new OnClickListener() {
-			
-			@Override
-			public void onClick(View v) {
-				((FileSelect) getActivity()).importFile(selectedFile.getPath());
-			}
-		});
-
-		if(mHideImport== true) {
-			mImportFile.setVisibility(View.GONE);
-		}
-
-
-		
-		return v;
-	}
-	
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		
-		mStartPath = ((FileSelect) getActivity()).getSelectPath();
-		getDir(mStartPath);
-	}
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);		
-	}
-
-	private void getDir(String dirPath) {
-
-		boolean useAutoSelection = dirPath.length() < currentPath.length();
-
-		Integer position = lastPositions.get(parentPath);
-
-		getDirImpl(dirPath);
-
-		if (position != null && useAutoSelection) {
-			getListView().setSelection(position);
-		}
-
-	}
-
-	/**
-	 * Monta a estrutura de arquivos e diretorios filhos do diretorio fornecido.
-	 * 
-	 * @param dirPath
-	 *            Diretorio pai.
-	 */
-	private void getDirImpl(final String dirPath) {
-
-		currentPath = dirPath;
-
-		final List<String> item = new ArrayList<String>();
-		path = new ArrayList<String>();
-		mList = new ArrayList<HashMap<String, Object>>();
-
-		File f = new File(currentPath);
-		File[] files = f.listFiles();
-		if (files == null) {
-			currentPath = ROOT;
-			f = new File(currentPath);
-			files = f.listFiles();
-		}
-		
-		myPath.setText(getText(R.string.location) + ": " + currentPath);
-
-		if (!currentPath.equals(ROOT)) {
-
-			item.add(ROOT);
-			addItem(ROOT, R.drawable.folder);
-			path.add(ROOT);
-
-			item.add("../");
-			addItem("../", R.drawable.folder);
-			path.add(f.getParent());
-			parentPath = f.getParent();
-
-		}
-
-		TreeMap<String, String> dirsMap = new TreeMap<String, String>();
-		TreeMap<String, String> dirsPathMap = new TreeMap<String, String>();
-		TreeMap<String, String> filesMap = new TreeMap<String, String>();
-		TreeMap<String, String> filesPathMap = new TreeMap<String, String>();
-		for (File file : files) {
-			if (file.isDirectory()) {
-				String dirName = file.getName();
-				dirsMap.put(dirName, dirName);
-				dirsPathMap.put(dirName, file.getPath());
-			} else {
-				final String fileName = file.getName();
-				final String fileNameLwr = fileName.toLowerCase();
-				// se ha um filtro de formatos, utiliza-o
-				if (formatFilter != null) {
-					boolean contains = false;
-					for (int i = 0; i < formatFilter.length; i++) {
-						final String formatLwr = formatFilter[i].toLowerCase();
-						if (fileNameLwr.endsWith(formatLwr)) {
-							contains = true;
-							break;
-						}
-					}
-					if (contains) {
-						filesMap.put(fileName, fileName);
-						filesPathMap.put(fileName, file.getPath());
-					}
-					// senao, adiciona todos os arquivos
-				} else {
-					filesMap.put(fileName, fileName);
-					filesPathMap.put(fileName, file.getPath());
-				}
-			}
-		}
-		item.addAll(dirsMap.tailMap("").values());
-		item.addAll(filesMap.tailMap("").values());
-		path.addAll(dirsPathMap.tailMap("").values());
-		path.addAll(filesPathMap.tailMap("").values());
-
-		SimpleAdapter fileList = new SimpleAdapter(getActivity(), mList, R.layout.file_dialog_row, new String[] {
-				ITEM_KEY, ITEM_IMAGE }, new int[] { R.id.fdrowtext, R.id.fdrowimage });
-
-		for (String dir : dirsMap.tailMap("").values()) {
-			addItem(dir, R.drawable.folder);
-		}
-
-		for (String file : filesMap.tailMap("").values()) {
-			addItem(file, R.drawable.file);
-		}
-
-		fileList.notifyDataSetChanged();
-
-		setListAdapter(fileList);
-
-	}
-
-	private void addItem(String fileName, int imageId) {
-		HashMap<String, Object> item = new HashMap<String, Object>();
-		item.put(ITEM_KEY, fileName);
-		item.put(ITEM_IMAGE, imageId);
-		mList.add(item);
-	}
-
-
-	@Override
-	public void onListItemClick(ListView l, View v, int position, long id) {
-
-		File file = new File(path.get(position));
-
-		if (file.isDirectory()) {
-			selectButton.setEnabled(false);
-			mImportFile.setEnabled(false);
-			
-			if (file.canRead()) {
-				lastPositions.put(currentPath, position);
-				getDir(path.get(position));
-			} else {
-				new AlertDialog.Builder(getActivity()).setIcon(R.drawable.icon)
-						.setTitle("[" + file.getName() + "] " + getText(R.string.cant_read_folder))
-						.setPositiveButton("OK", null).show();
-			}
-		} else {
-			selectedFile = file;
-			v.setSelected(true);
-			selectButton.setEnabled(true);
-			mImportFile.setEnabled(true);
-		}
-	}
-
-	public void setNoInLine() {
-		mHideImport=true;
-	}
-
-}
diff --git a/src/se/leap/openvpn/GeneralSettings.java b/src/se/leap/openvpn/GeneralSettings.java
deleted file mode 100644
index 93e4818e..00000000
--- a/src/se/leap/openvpn/GeneralSettings.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package se.leap.openvpn;
-import java.io.File;
-
-import se.leap.bitmaskclient.R;
-
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-
-public class GeneralSettings extends PreferenceFragment {
-
-		@Override
-		public void onCreate(Bundle savedInstanceState) {
-			super.onCreate(savedInstanceState);
-			
-
-			// Load the preferences from an XML resource
-			addPreferencesFromResource(R.xml.general_settings);
-			Preference loadtun = findPreference("loadTunModule");
-			if(!isTunModuleAvailable())
-				loadtun.setEnabled(false);
-		}
-
-		private boolean isTunModuleAvailable() {
-			// Check if the tun module exists on the file system
-			if(new File("/system/lib/modules/tun.ko").length() > 10)
-				return true;
-			return false;
-		}
-
-	
-	}
\ No newline at end of file
diff --git a/src/se/leap/openvpn/InlineFileTab.java b/src/se/leap/openvpn/InlineFileTab.java
deleted file mode 100644
index 9e8041c0..00000000
--- a/src/se/leap/openvpn/InlineFileTab.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package se.leap.openvpn;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import se.leap.bitmaskclient.R;
-
-public class InlineFileTab extends Fragment
-{
-
-	private static final int MENU_SAVE = 0;
-	private EditText mInlineData;
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-
-		mInlineData.setText(((FileSelect)getActivity()).getInlineData());
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState)
-	{
-
-		View v = inflater.inflate(R.layout.file_dialog_inline, container, false);
-		mInlineData =(EditText) v.findViewById(R.id.inlineFileData);
-		return v;
-	}
-
-	public void setData(String data) {
-		if(mInlineData!=null)
-			mInlineData.setText(data);
-
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setHasOptionsMenu(true);
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		menu.add(0, MENU_SAVE, 0, "Use inline data")
-		.setIcon(android.R.drawable.ic_menu_save)
-		.setAlphabeticShortcut('u')
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-				| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-	}
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if(item.getItemId()==MENU_SAVE){
-			((FileSelect)getActivity()).saveInlineData(mInlineData.getText().toString());
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-}
\ No newline at end of file
diff --git a/src/se/leap/openvpn/LogWindow.java b/src/se/leap/openvpn/LogWindow.java
index c3ce8424..1fe50d6a 100644
--- a/src/se/leap/openvpn/LogWindow.java
+++ b/src/se/leap/openvpn/LogWindow.java
@@ -227,18 +227,6 @@ public class LogWindow extends ListActivity implements StateListener  {
 
 		} else if(item.getItemId()==R.id.send) {
 			ladapter.shareLog();
-		} else if(item.getItemId()==R.id.edit_vpn) {
-			VpnProfile lastConnectedprofile = ProfileManager.getLastConnectedVpn();
-
-			if(lastConnectedprofile!=null) {
-				Intent vprefintent = new Intent(this,VPNPreferences.class)
-				.putExtra(VpnProfile.EXTRA_PROFILEUUID,lastConnectedprofile.getUUIDString());
-				startActivityForResult(vprefintent,START_VPN_CONFIG);
-			} else {
-				Toast.makeText(this, R.string.log_no_last_vpn, Toast.LENGTH_LONG).show();
-			}
-
-
 		}
 
 		return super.onOptionsItemSelected(item);
diff --git a/src/se/leap/openvpn/MainActivity.java b/src/se/leap/openvpn/MainActivity.java
deleted file mode 100644
index 0a769b4d..00000000
--- a/src/se/leap/openvpn/MainActivity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package se.leap.openvpn;
-
-import java.util.List;
-
-import se.leap.bitmaskclient.R;
-
-import android.content.Intent;
-import android.preference.PreferenceActivity;
-
-public class MainActivity extends PreferenceActivity {
-
-	@Override
-	public void onBuildHeaders(List<Header> target) {
-		loadHeadersFromResource(R.xml.main_headers, target);
-		
-
-		String translatedby = getString(R.string.translationby);
-		if(!translatedby.equals("") && !translatedby.contains("Arne Schwabe")) {
-			Header translation = new Header();
-			translation.title = getString(R.string.translation);
-			translation.summary = translatedby;
-			target.add(translation);
-		}
-		
-		if(SendDumpActivity.getLastestDump(this)!=null) {
-			Header sendDump = new Header();
-			sendDump.titleRes = R.string.send_minidump;
-			sendDump.summaryRes = R.string.send_minidump_summary;
-			sendDump.intent = new Intent(this,SendDumpActivity.class);
-			target.add(sendDump);
-		}
-		
-	}
-	
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		
-		System.out.println(data);
-		
-		
-	}
-
-
-}
diff --git a/src/se/leap/openvpn/SendDumpActivity.java b/src/se/leap/openvpn/SendDumpActivity.java
deleted file mode 100644
index 20194db0..00000000
--- a/src/se/leap/openvpn/SendDumpActivity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package se.leap.openvpn;
-
-import java.io.File;
-import java.util.ArrayList;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-public class SendDumpActivity extends Activity {
-	
-	protected void onStart() {
-		super.onStart();
-		emailMiniDumps();
-		finish();
-	};
-	
-	public void emailMiniDumps()
-	{
-		//need to "send multiple" to get more than one attachment
-		final Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND_MULTIPLE);
-		emailIntent.setType("*/*");
-		emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL, 
-				new String[]{"Arne Schwabe <arne@rfc2549.org>"});
-		emailIntent.putExtra(Intent.EXTRA_SUBJECT, "OpenVPN Minidump");
-
-		emailIntent.putExtra(Intent.EXTRA_TEXT, "Please describe the issue you have experienced");
-
-		ArrayList<Uri> uris = new ArrayList<Uri>();
-
-		File ldump = getLastestDump(this);
-		if(ldump==null) {
-			OpenVPN.logError("No Minidump found!");
-		}
-		
-		uris.add(Uri.parse("content://se.leap.openvpn.FileProvider/" + ldump.getName()));
-		uris.add(Uri.parse("content://se.leap.openvpn.FileProvider/" + ldump.getName() + ".log"));
-
-		emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-		emailIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
-		startActivity(emailIntent);
-	}
-
-	static public File getLastestDump(Context c) {
-		long newestDumpTime=0;
-		File newestDumpFile=null;
-
-		for(File f:c.getCacheDir().listFiles()) {
-			if(!f.getName().endsWith(".dmp"))
-				continue;
-
-			if (newestDumpTime < f.lastModified()) {
-				newestDumpTime = f.lastModified();
-				newestDumpFile=f;
-			}
-		}
-		return newestDumpFile;
-	}
-}
diff --git a/src/se/leap/openvpn/Settings_Authentication.java b/src/se/leap/openvpn/Settings_Authentication.java
deleted file mode 100644
index 7824d790..00000000
--- a/src/se/leap/openvpn/Settings_Authentication.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package se.leap.openvpn;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
-import se.leap.bitmaskclient.R;
-
-
-public class Settings_Authentication extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener, OnPreferenceClickListener {
-	private static final int SELECT_TLS_FILE = 23223232;
-	private CheckBoxPreference mExpectTLSCert;
-	private CheckBoxPreference mCheckRemoteCN;
-	private EditTextPreference mRemoteCN;
-	private ListPreference mTLSAuthDirection;
-	private Preference mTLSAuthFile;
-	private SwitchPreference mUseTLSAuth;
-	private EditTextPreference mCipher;
-	private String mTlsAuthFileData;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.vpn_authentification);
-
-		mExpectTLSCert = (CheckBoxPreference) findPreference("remoteServerTLS");
-		mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
-		mRemoteCN = (EditTextPreference) findPreference("remotecn");
-		mRemoteCN.setOnPreferenceChangeListener(this);
-		
-		mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth" );
-		mTLSAuthFile = findPreference("tlsAuthFile");
-		mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
-		
-		
-		mTLSAuthFile.setOnPreferenceClickListener(this);		
-		
-		mCipher =(EditTextPreference) findPreference("cipher");
-		mCipher.setOnPreferenceChangeListener(this);
-		
-		loadSettings();
-
-	}
-
-	@Override
-	protected void loadSettings() {
-		
-		mExpectTLSCert.setChecked(mProfile.mExpectTLSCert);
-		mCheckRemoteCN.setChecked(mProfile.mCheckRemoteCN);
-		mRemoteCN.setText(mProfile.mRemoteCN);
-		onPreferenceChange(mRemoteCN, mProfile.mRemoteCN);
-		
-		mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
-		mTlsAuthFileData= mProfile.mTLSAuthFilename;
-		setTlsAuthSummary(mTlsAuthFileData);
-		mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
-		mCipher.setText(mProfile.mCipher);
-		onPreferenceChange(mCipher, mProfile.mCipher);
-	}
-	
-	@Override
-	protected void saveSettings() {
-		mProfile.mExpectTLSCert=mExpectTLSCert.isChecked();
-		mProfile.mCheckRemoteCN=mCheckRemoteCN.isChecked();
-		mProfile.mRemoteCN=mRemoteCN.getText();
-		
-		mProfile.mUseTLSAuth = mUseTLSAuth.isChecked();
-		mProfile.mTLSAuthFilename = mTlsAuthFileData;
-		
-		if(mTLSAuthDirection.getValue()==null)
-			mProfile.mTLSAuthDirection=null;
-		else
-			mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue().toString();
-		
-		if(mCipher.getText()==null)
-			mProfile.mCipher=null;
-		else
-			mProfile.mCipher = mCipher.getText();
-		
-	}
-	
-	
-
-	@Override
-	public boolean onPreferenceChange(Preference preference, Object newValue) {
-		if(preference==mRemoteCN) {
-			if ("".equals(newValue))
-				preference.setSummary(mProfile.mServerName);
-			else
-				preference.setSummary((String)newValue);
-		} else if (preference == mCipher) {
-			preference.setSummary((CharSequence) newValue);
-		}
-		return true;
-	}
-	void startFileDialog() {
-		Intent startFC = new Intent(getActivity(),FileSelect.class);
-		startFC.putExtra(FileSelect.START_DATA, Environment.getExternalStorageDirectory().getPath());
-	
-		startActivityForResult(startFC,SELECT_TLS_FILE);
-	}
-	@Override
-	public boolean onPreferenceClick(Preference preference) {
-		startFileDialog();
-		return true;
-		
-	}
-	
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if(requestCode==SELECT_TLS_FILE && resultCode == Activity.RESULT_OK){
-			   String result = data.getStringExtra(FileSelect.RESULT_DATA);
-			   mTlsAuthFileData=result;
-			   setTlsAuthSummary(result);
-			
-		}
-	}
-
-	private void setTlsAuthSummary(String result) {
-		if(result==null) result = getString(R.string.no_certificate);
-		if(result.startsWith(VpnProfile.INLINE_TAG))
-			   mTLSAuthFile.setSummary(R.string.inline_file_data);
-		   else
-			   mTLSAuthFile.setSummary(result);
-	}
-}
\ No newline at end of file
diff --git a/src/se/leap/openvpn/Settings_Basic.java b/src/se/leap/openvpn/Settings_Basic.java
deleted file mode 100644
index 014c71a1..00000000
--- a/src/se/leap/openvpn/Settings_Basic.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package se.leap.openvpn;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.app.Fragment;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Handler.Callback;
-import android.os.Message;
-import android.security.KeyChain;
-import android.security.KeyChainAliasCallback;
-import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.ToggleButton;
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.R.id;
-
-public class Settings_Basic extends Fragment implements View.OnClickListener, OnItemSelectedListener, Callback {
-	private static final int CHOOSE_FILE_OFFSET = 1000;
-	private static final int UPDATE_ALIAS = 20;
-
-
-
-	private TextView mServerAddress;
-	private TextView mServerPort;
-	private FileSelectLayout mClientCert;
-	private FileSelectLayout mCaCert;
-	private FileSelectLayout mClientKey;
-	private TextView mAliasName;
-	private CheckBox mUseLzo;
-	private ToggleButton mTcpUdp;
-	private Spinner mType;
-	private FileSelectLayout mpkcs12;
-	private TextView mPKCS12Password;
-
-	private Handler mHandler;
-
-
-
-
-
-	private SparseArray<FileSelectLayout> fileselects = new SparseArray<FileSelectLayout>();
-
-
-	private EditText mUserName;
-
-
-	private EditText mPassword;
-
-
-	private View mView;
-
-
-	private VpnProfile mProfile;
-	private EditText mProfileName;
-	private EditText mKeyPassword;
-
-
-
-	private void addFileSelectLayout (FileSelectLayout fsl) {
-		int i = fileselects.size() + CHOOSE_FILE_OFFSET;
-		fileselects.put(i, fsl);
-		fsl.setFragment(this,i);
-	}
-
-
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		String profileuuid =getArguments().getString(getActivity().getPackageName() + ".profileUUID");
-		mProfile=ProfileManager.get(profileuuid);
-		getActivity().setTitle(getString(R.string.edit_profile_title, mProfile.getName()));
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
-
-		mView = inflater.inflate(R.layout.basic_settings,container,false);
-
-		mProfileName = (EditText) mView.findViewById(R.id.profilename);
-		mServerAddress = (TextView) mView.findViewById(R.id.address);
-		mServerPort = (TextView) mView.findViewById(R.id.port);
-		mClientCert = (FileSelectLayout) mView.findViewById(R.id.certselect);
-		mClientKey = (FileSelectLayout) mView.findViewById(R.id.keyselect);
-		mCaCert = (FileSelectLayout) mView.findViewById(R.id.caselect);
-		mpkcs12 = (FileSelectLayout) mView.findViewById(R.id.pkcs12select);
-		mUseLzo = (CheckBox) mView.findViewById(R.id.lzo);
-		mTcpUdp = (ToggleButton) mView.findViewById(id.tcpudp);
-		mType = (Spinner) mView.findViewById(R.id.type);
-		mPKCS12Password = (TextView) mView.findViewById(R.id.pkcs12password);
-		mAliasName = (TextView) mView.findViewById(R.id.aliasname);
-
-		mUserName = (EditText) mView.findViewById(R.id.auth_username);
-		mPassword = (EditText) mView.findViewById(R.id.auth_password);
-		mKeyPassword = (EditText) mView.findViewById(R.id.key_password);
-
-
-
-		addFileSelectLayout(mCaCert);
-		addFileSelectLayout(mClientCert);
-		addFileSelectLayout(mClientKey);
-		addFileSelectLayout(mpkcs12);
-		mpkcs12.setBase64Encode();
-		mCaCert.setShowClear();
-
-	
-		mType.setOnItemSelectedListener(this);
-
-		mView.findViewById(R.id.select_keystore_button).setOnClickListener(this);
-
-
-		if (mHandler == null) {
-			mHandler = new Handler(this);
-		}
-
-		return mView;
-	}
-
-	
-	@Override
-	public void onStart() {
-		super.onStart();
-		String profileuuid =getArguments().getString(getActivity().getPackageName() + ".profileUUID");
-		mProfile=ProfileManager.get(profileuuid);
-		loadPreferences();
-
-	}
-
-	@Override
-	public void onActivityResult(int request, int result, Intent data) {
-		if (result == Activity.RESULT_OK && request >= CHOOSE_FILE_OFFSET) {
-			String filedata = data.getStringExtra(FileSelect.RESULT_DATA);
-			FileSelectLayout fsl = fileselects.get(request);
-			fsl.setData(filedata);
-
-			savePreferences();
-
-			// Private key files may result in showing/hiding the private key password dialog
-			if(fsl==mClientKey) {
-				changeType(mType.getSelectedItemPosition());
-			}
-		}
-
-	}
-
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-	}
-
-	@Override
-	public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-		if (parent == mType) {
-			changeType(position);
-		}
-	}
-	@Override
-	public void onPause() {
-		super.onPause();
-		savePreferences();
-	}
-
-
-
-	private void changeType(int type){
-		// hide everything
-		mView.findViewById(R.id.pkcs12).setVisibility(View.GONE);
-		mView.findViewById(R.id.certs).setVisibility(View.GONE);
-		mView.findViewById(R.id.statickeys).setVisibility(View.GONE);
-		mView.findViewById(R.id.keystore).setVisibility(View.GONE);
-		mView.findViewById(R.id.cacert).setVisibility(View.GONE);
-		mView.findViewById(R.id.userpassword).setVisibility(View.GONE);
-		mView.findViewById(R.id.key_password_layout).setVisibility(View.GONE);
-
-		// Fall through are by design
-		switch(type) {
-		case VpnProfile.TYPE_USERPASS_CERTIFICATES:
-			mView.findViewById(R.id.userpassword).setVisibility(View.VISIBLE);
-		case VpnProfile.TYPE_CERTIFICATES:
-			mView.findViewById(R.id.certs).setVisibility(View.VISIBLE);
-			mView.findViewById(R.id.cacert).setVisibility(View.VISIBLE);
-			if(mProfile.requireTLSKeyPassword())
-				mView.findViewById(R.id.key_password_layout).setVisibility(View.VISIBLE);
-			break;
-			
-		case VpnProfile.TYPE_USERPASS_PKCS12:
-			mView.findViewById(R.id.userpassword).setVisibility(View.VISIBLE);
-		case VpnProfile.TYPE_PKCS12:
-			mView.findViewById(R.id.pkcs12).setVisibility(View.VISIBLE);
-			break;
-			
-		case VpnProfile.TYPE_STATICKEYS:
-			mView.findViewById(R.id.statickeys).setVisibility(View.VISIBLE);
-			break;
-
-		case VpnProfile.TYPE_USERPASS_KEYSTORE:
-			mView.findViewById(R.id.userpassword).setVisibility(View.VISIBLE);
-		case VpnProfile.TYPE_KEYSTORE:
-			mView.findViewById(R.id.keystore).setVisibility(View.VISIBLE);
-			mView.findViewById(R.id.cacert).setVisibility(View.VISIBLE);
-			break;
-
-		case VpnProfile.TYPE_USERPASS:
-			mView.findViewById(R.id.userpassword).setVisibility(View.VISIBLE);
-			mView.findViewById(R.id.cacert).setVisibility(View.VISIBLE);
-			break;
-		}
-
-
-	}
-
-	private void loadPreferences() {
-		mProfileName.setText(mProfile.mName);
-		mClientCert.setData(mProfile.mClientCertFilename);
-		mClientKey.setData(mProfile.mClientKeyFilename);
-		mCaCert.setData(mProfile.mCaFilename);
-
-		mUseLzo.setChecked(mProfile.mUseLzo);
-		mServerPort.setText(mProfile.mServerPort);
-		mServerAddress.setText(mProfile.mServerName);
-		mTcpUdp.setChecked(mProfile.mUseUdp);
-		mType.setSelection(mProfile.mAuthenticationType);
-		mpkcs12.setData(mProfile.mPKCS12Filename);
-		mPKCS12Password.setText(mProfile.mPKCS12Password);
-		mUserName.setText(mProfile.mUsername);
-		mPassword.setText(mProfile.mPassword);
-		mKeyPassword.setText(mProfile.mKeyPassword);
-
-		setAlias();
-
-	}
-
-	void savePreferences() {
-
-		mProfile.mName = mProfileName.getText().toString();
-		mProfile.mCaFilename = mCaCert.getData();
-		mProfile.mClientCertFilename = mClientCert.getData();
-		mProfile.mClientKeyFilename = mClientKey.getData();
-
-		mProfile.mUseLzo = mUseLzo.isChecked();
-		mProfile.mServerPort =mServerPort.getText().toString();
-		mProfile.mServerName = mServerAddress.getText().toString();
-		mProfile.mUseUdp = mTcpUdp.isChecked();
-
-		mProfile.mAuthenticationType = mType.getSelectedItemPosition();
-		mProfile.mPKCS12Filename = mpkcs12.getData();
-		mProfile.mPKCS12Password = mPKCS12Password.getText().toString();
-
-		mProfile.mPassword = mPassword.getText().toString();
-		mProfile.mUsername = mUserName.getText().toString();
-		mProfile.mKeyPassword = mKeyPassword.getText().toString();
-
-	}
-
-
-	private void setAlias() {
-		if(mProfile.mAlias == null) {
-			mAliasName.setText(R.string.client_no_certificate);
-		} else {
-			mAliasName.setText(mProfile.mAlias);
-		}
-	}
-
-	public void showCertDialog () {
-		try	{
-			KeyChain.choosePrivateKeyAlias(getActivity(),
-					new KeyChainAliasCallback() {
-
-				public void alias(String alias) {
-					// Credential alias selected.  Remember the alias selection for future use.
-					mProfile.mAlias=alias;
-					mHandler.sendEmptyMessage(UPDATE_ALIAS);
-				}
-
-
-			},
-			new String[] {"RSA"}, // List of acceptable key types. null for any
-			null,                        // issuer, null for any
-			mProfile.mServerName,      // host name of server requesting the cert, null if unavailable
-			-1,                         // port of server requesting the cert, -1 if unavailable
-			mProfile.mAlias);                       // alias to preselect, null if unavailable
-		} catch (ActivityNotFoundException anf) {
-			Builder ab = new AlertDialog.Builder(getActivity());
-			ab.setTitle(R.string.broken_image_cert_title);
-			ab.setMessage(R.string.broken_image_cert);
-			ab.setPositiveButton(android.R.string.ok, null);
-			ab.show();
-		}
-	}
-
-	@Override
-	public void onClick(View v) {
-		if (v == mView.findViewById(R.id.select_keystore_button)) {
-			showCertDialog();
-		}
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
-		savePreferences();
-		if(mProfile!=null) {
-			outState.putString(getActivity().getPackageName() + "profileUUID", mProfile.getUUID().toString());
-		}
-	}
-
-	@Override
-	public void onNothingSelected(AdapterView<?> parent) {
-	}
-
-
-	@Override
-	public boolean handleMessage(Message msg) {
-		setAlias();
-		return true;
-	}
-
-
-}
diff --git a/src/se/leap/openvpn/Settings_IP.java b/src/se/leap/openvpn/Settings_IP.java
deleted file mode 100644
index bb605937..00000000
--- a/src/se/leap/openvpn/Settings_IP.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package se.leap.openvpn;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceManager;
-import android.preference.SwitchPreference;
-import se.leap.bitmaskclient.R;
-
-public class Settings_IP extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
-		private EditTextPreference mIPv4;
-		private EditTextPreference mIPv6;
-		private SwitchPreference mUsePull;
-		private CheckBoxPreference mOverrideDNS;
-		private EditTextPreference mSearchdomain;
-		private EditTextPreference mDNS1;
-		private EditTextPreference mDNS2;
-		private CheckBoxPreference mNobind;
-
-		@Override
-		public void onCreate(Bundle savedInstanceState) {
-			super.onCreate(savedInstanceState);
-			
-		
-			// Make sure default values are applied.  In a real app, you would
-			// want this in a shared function that is used to retrieve the
-			// SharedPreferences wherever they are needed.
-			PreferenceManager.setDefaultValues(getActivity(),
-					R.xml.vpn_ipsettings, false);
-			
-			// Load the preferences from an XML resource
-			addPreferencesFromResource(R.xml.vpn_ipsettings);
-			mIPv4 = (EditTextPreference) findPreference("ipv4_address");
-			mIPv6 = (EditTextPreference) findPreference("ipv6_address");
-			mUsePull = (SwitchPreference) findPreference("usePull");
-			mOverrideDNS = (CheckBoxPreference) findPreference("overrideDNS");
-			mSearchdomain =(EditTextPreference) findPreference("searchdomain");
-			mDNS1 = (EditTextPreference) findPreference("dns1");
-			mDNS2 = (EditTextPreference) findPreference("dns2");
-			mNobind = (CheckBoxPreference) findPreference("nobind");
-
-			mIPv4.setOnPreferenceChangeListener(this);
-			mIPv6.setOnPreferenceChangeListener(this);
-			mDNS1.setOnPreferenceChangeListener(this);
-			mDNS2.setOnPreferenceChangeListener(this);
-			mUsePull.setOnPreferenceChangeListener(this);
-			mOverrideDNS.setOnPreferenceChangeListener(this);
-			mSearchdomain.setOnPreferenceChangeListener(this);
-						
-			loadSettings();
-		}
-
-		@Override
-		protected void loadSettings() {
-		
-			mUsePull.setChecked(mProfile.mUsePull);
-			mIPv4.setText(mProfile.mIPv4Address);
-			mIPv6.setText(mProfile.mIPv6Address);
-			mDNS1.setText(mProfile.mDNS1);
-			mDNS2.setText(mProfile.mDNS2);
-			mOverrideDNS.setChecked(mProfile.mOverrideDNS);
-			mSearchdomain.setText(mProfile.mSearchDomain);
-			mNobind.setChecked(mProfile.mNobind);
-			
-			// Sets Summary
-			onPreferenceChange(mIPv4, mIPv4.getText());
-			onPreferenceChange(mIPv6, mIPv6.getText());
-			onPreferenceChange(mDNS1, mDNS1.getText());
-			onPreferenceChange(mDNS2, mDNS2.getText());
-			onPreferenceChange(mSearchdomain, mSearchdomain.getText());
-									
-			setDNSState();
-		}
-		
-		
-		@Override
-		protected void saveSettings() {
-			mProfile.mUsePull = mUsePull.isChecked();
-			mProfile.mIPv4Address = mIPv4.getText();
-			mProfile.mIPv6Address = mIPv6.getText();
-			mProfile.mDNS1 = mDNS1.getText();
-			mProfile.mDNS2 = mDNS2.getText();
-			mProfile.mOverrideDNS = mOverrideDNS.isChecked();
-			mProfile.mSearchDomain = mSearchdomain.getText();
-			mProfile.mNobind = mNobind.isChecked();
-			
-		}
-		
-		@Override
-		public boolean onPreferenceChange(Preference preference,
-				Object newValue) {
-			if(preference==mIPv4 || preference == mIPv6 
-					 || preference==mDNS1 || preference == mDNS2
-					 || preference == mSearchdomain 
-					)
-			
-				preference.setSummary((String)newValue);
-
-			if(preference== mUsePull || preference == mOverrideDNS)
-				if(preference==mOverrideDNS) { 
-					// Set so the function gets the right value
-					mOverrideDNS.setChecked((Boolean) newValue);
-				}
-				setDNSState();
-			
-			saveSettings();
-			return true;
-		}
-
-		private void setDNSState() {
-			boolean enabled;
-			mOverrideDNS.setEnabled(mUsePull.isChecked());
-			if(!mUsePull.isChecked())
-				enabled =true;
-			else if (mOverrideDNS.isChecked())
-				enabled = true;
-			else
-				enabled = false;
-
-			mDNS1.setEnabled(enabled);
-			mDNS2.setEnabled(enabled);
-			mSearchdomain.setEnabled(enabled);
-			
-
-		}
-
-
-	}
\ No newline at end of file
diff --git a/src/se/leap/openvpn/VPNPreferences.java b/src/se/leap/openvpn/VPNPreferences.java
deleted file mode 100644
index e3052050..00000000
--- a/src/se/leap/openvpn/VPNPreferences.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package se.leap.openvpn;
-
-import java.util.List;
-
-import se.leap.bitmaskclient.R;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-
-
-public class VPNPreferences extends PreferenceActivity {
-
-	private String mProfileUUID;
-	private VpnProfile mProfile;
-
-	public VPNPreferences() {
-		super();
-
-	}
-
-
-
-
-	@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();
-		
-	}
-}
-
diff --git a/src/se/leap/openvpn/VPNProfileList.java b/src/se/leap/openvpn/VPNProfileList.java
deleted file mode 100644
index 0ef611df..00000000
--- a/src/se/leap/openvpn/VPNProfileList.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package se.leap.openvpn;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.TreeSet;
-
-import se.leap.bitmaskclient.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.ListFragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.Html.ImageGetter;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class VPNProfileList extends ListFragment {
-
-	final static int RESULT_VPN_DELETED = Activity.RESULT_FIRST_USER;
-
-	private static final int MENU_ADD_PROFILE = Menu.FIRST;
-
-	private static final int START_VPN_CONFIG = 92;
-	private static final int SELECT_PROFILE = 43;
-	private static final int IMPORT_PROFILE = 231;
-
-	private static final int MENU_IMPORT_PROFILE = Menu.FIRST +1;
-
-	class VPNArrayAdapter extends ArrayAdapter<VpnProfile> {
-
-		public VPNArrayAdapter(Context context, int resource,
-				int textViewResourceId) {
-			super(context, resource, textViewResourceId);
-		}
-
-		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			View v = super.getView(position, convertView, parent);
-
-			View titleview = v.findViewById(R.id.vpn_list_item_left);
-			titleview.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					VpnProfile profile =(VpnProfile) getListAdapter().getItem(position);
-					startVPN(profile);
-				}
-			});
-
-			View settingsview = v.findViewById(R.id.quickedit_settings);
-			settingsview.setOnClickListener(new OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					mEditProfile =(VpnProfile) getListAdapter().getItem(position);
-					editVPN(mEditProfile);
-
-				}
-			});
-
-			return v;
-		}
-	}
-
-
-
-
-
-
-
-
-	private ArrayAdapter<VpnProfile> mArrayadapter;
-
-	protected VpnProfile mEditProfile=null;
-
-
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setHasOptionsMenu(true);
-
-		// Debug load JNI
-		//OpenVPN.foo();
-	}
-
-
-	class MiniImageGetter implements ImageGetter {
-
-
-		@Override
-		public Drawable getDrawable(String source) {
-			Drawable d=null;
-			if ("ic_menu_add".equals(source))
-				d = getActivity().getResources().getDrawable(android.R.drawable.ic_menu_add);
-			else if("ic_menu_archive".equals(source))
-				d = getActivity().getResources().getDrawable(R.drawable.ic_menu_archive);
-			
-			
-			
-			if(d!=null) {
-				d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
-				return d;
-			}else{
-				return null;
-			}
-		}
-	}
-
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.vpn_profile_list, container,false);
-
-		TextView newvpntext = (TextView) v.findViewById(R.id.add_new_vpn_hint);
-		TextView importvpntext = (TextView) v.findViewById(R.id.import_vpn_hint);
-		
-		
-		
-		newvpntext.setText(Html.fromHtml(getString(R.string.add_new_vpn_hint),new MiniImageGetter(),null));
-		importvpntext.setText(Html.fromHtml(getString(R.string.vpn_import_hint),new MiniImageGetter(),null));
-		
-        
-
-		return v;
-
-	}
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		setListAdapter();
-	}
-
-	class VpnProfileNameComperator implements Comparator<VpnProfile> {
-
-		@Override
-		public int compare(VpnProfile lhs, VpnProfile rhs) {
-			return lhs.mName.compareTo(rhs.mName);
-		}
-
-	}
-
-	private void setListAdapter() {
-		mArrayadapter = new VPNArrayAdapter(getActivity(),R.layout.vpn_list_item,R.id.vpn_item_title);
-		Collection<VpnProfile> allvpn = getPM().getProfiles();
-
-		TreeSet<VpnProfile> sortedset = new TreeSet<VpnProfile>(new VpnProfileNameComperator()); 
-		sortedset.addAll(allvpn);
-		mArrayadapter.addAll(sortedset);
-
-		setListAdapter(mArrayadapter);
-	}
-
-
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		menu.add(0, MENU_ADD_PROFILE, 0, R.string.menu_add_profile)
-		.setIcon(android.R.drawable.ic_menu_add)
-		.setAlphabeticShortcut('a')
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-				| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-
-		menu.add(0, MENU_IMPORT_PROFILE, 0, R.string.menu_import)
-		.setIcon(R.drawable.ic_menu_archive)
-		.setAlphabeticShortcut('i')
-		.setTitleCondensed(getActivity().getString(R.string.menu_import_short))
-		.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-				| MenuItem.SHOW_AS_ACTION_WITH_TEXT );
-	}
-
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		final int itemId = item.getItemId();
-		if (itemId == MENU_ADD_PROFILE) {
-			onAddProfileClicked();
-			return true;
-		} else if (itemId == MENU_IMPORT_PROFILE) {
-			startImportConfig();
-			return true;
-		} else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	private void startImportConfig() {
-		Intent intent = new Intent(getActivity(),FileSelect.class);
-		intent.putExtra(FileSelect.NO_INLINE_SELECTION, true);
-		intent.putExtra(FileSelect.WINDOW_TITLE, R.string.import_configuration_file);
-		startActivityForResult(intent, SELECT_PROFILE);
-	}
-
-
-
-
-
-	private void onAddProfileClicked() {
-		Context context = getActivity();
-		if (context != null) {
-			final EditText entry = new EditText(context);
-			entry.setSingleLine();
-
-			AlertDialog.Builder dialog = new AlertDialog.Builder(context);
-			dialog.setTitle(R.string.menu_add_profile);
-			dialog.setMessage(R.string.add_profile_name_prompt);
-			dialog.setView(entry);
-
-
-			dialog.setPositiveButton(android.R.string.ok,
-					new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					String name = entry.getText().toString();
-					if (getPM().getProfileByName(name)==null) {
-						VpnProfile profile = new VpnProfile(name);
-						addProfile(profile);
-					} else {
-						Toast.makeText(getActivity(), R.string.duplicate_profile_name, Toast.LENGTH_LONG).show();
-					}
-				}
-
-
-			});
-			dialog.setNegativeButton(android.R.string.cancel, null);
-			dialog.create().show();
-		}
-
-	}
-
-
-	private void addProfile(VpnProfile profile) {
-		getPM().addProfile(profile);
-		getPM().saveProfileList(getActivity());
-		getPM().saveProfile(getActivity(),profile);
-		mArrayadapter.add(profile);
-	}
-
-
-
-
-
-	private ProfileManager getPM() {
-		return ProfileManager.getInstance(getActivity());
-	}
-
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-
-		if(resultCode == RESULT_VPN_DELETED){
-			if(mArrayadapter != null && mEditProfile !=null)
-				mArrayadapter.remove(mEditProfile);
-		}
-
-		if(resultCode != Activity.RESULT_OK)
-			return;
-
-		if (requestCode == START_VPN_CONFIG) {
-			String configuredVPN = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
-
-			VpnProfile profile = ProfileManager.get(configuredVPN);
-			getPM().saveProfile(getActivity(), profile);
-			// Name could be modified, reset List adapter
-			setListAdapter();
-
-		} else if(requestCode== SELECT_PROFILE) {
-			String filedata = data.getStringExtra(FileSelect.RESULT_DATA);
-			Intent startImport = new Intent(getActivity(),ConfigConverter.class);
-			startImport.setAction(ConfigConverter.IMPORT_PROFILE);
-			Uri uri = new Uri.Builder().path(filedata).scheme("file").build();
-			startImport.setData(uri);
-			startActivityForResult(startImport, IMPORT_PROFILE);
-		} else if(requestCode == IMPORT_PROFILE) {
-			String profileUUID = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID);
-			mArrayadapter.add(ProfileManager.get(profileUUID));
-		}
-
-	}
-
-
-	private void editVPN(VpnProfile profile) {
-
-		Intent vprefintent = new Intent(getActivity(),VPNPreferences.class)
-		.putExtra(getActivity().getPackageName() + ".profileUUID", profile.getUUID().toString());
-
-		startActivityForResult(vprefintent,START_VPN_CONFIG);
-	}
-
-	private void startVPN(VpnProfile profile) {
-
-		getPM().saveProfile(getActivity(), profile);
-
-		Intent intent = new Intent(getActivity(),LaunchVPN.class);
-		intent.putExtra(LaunchVPN.EXTRA_KEY, profile.getUUID().toString());
-		intent.setAction(Intent.ACTION_MAIN);
-		startActivity(intent);
-
-		getActivity().finish();
-	}
-}