Rework FIle selection dialog.

Include possibility to include file content in VPN Profile. Allows safer storage of Certifcates and keys. (closes issue #13)

1 files changed, 145 insertions, 0 deletions

diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java
new file mode 100644
index 00000000..3cc060c6
--- /dev/null
+++ b/src/de/blinkt/openvpn/FileSelect.java
@@ -0,0 +1,145 @@
+package de.blinkt.openvpn;
+
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+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.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+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 INLINE_TAG = "[[INLINE]]";
+	private FileSelectionFragment mFSFragment;
+	private InlineFileTab mInlineFragment;
+	private String mData;
+	private Tab inlineFileTab;
+	private Tab fileExplorerTab;
+
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState); 
+		setContentView(R.layout.file_dialog);
+
+		mData = getIntent().getStringExtra(START_DATA);
+		
+		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();
+		mInlineFragment = new InlineFileTab();
+		fileExplorerTab.setTabListener(new MyTabsListener<FileSelectionFragment>(this, mFSFragment));
+		inlineFileTab.setTabListener(new MyTabsListener<InlineFileTab>(this, mInlineFragment));
+
+		bar.addTab(fileExplorerTab);
+		bar.addTab(inlineFileTab);
+		
+
+		
+	}
+
+	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 {
+			FileInputStream fis = new FileInputStream(ifile);
+			String data =INLINE_TAG;
+
+			byte buf[] =new byte[16384];
+			int len=fis.read(buf);
+			while(len >0) {
+				data += new String(buf,0,len);
+				len=fis.read(buf);
+			}
+			
+			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();
+		}
+	}
+
+	public void setFile(String path) {
+		Intent intent = new Intent();
+		intent.putExtra(RESULT_DATA, mData);
+		setResult(Activity.RESULT_OK,intent);
+		finish();		
+	}
+
+	public String getSelectPath() {
+		if(mData.startsWith(INLINE_TAG))
+			return mData;
+		else
+			return "/mnt/sdcard";
+	}
+
+	public CharSequence getInlineData() {
+		if(mData.startsWith(INLINE_TAG))
+			return mData.substring(INLINE_TAG.length());
+		else
+			return "";
+	}
+
+	public void saveInlineData(String string) {
+		Intent intent = new Intent();
+		intent.putExtra(RESULT_DATA, mData);
+		setResult(Activity.RESULT_OK,intent);
+		finish();
+		
+	}
+}