Config Import useable (closes issue #14)

Correct save/restore state in Basic Settings (closes issue #17)

1 files changed, 11 insertions, 3 deletions

diff --git a/src/de/blinkt/openvpn/FileSelectLayout.java b/src/de/blinkt/openvpn/FileSelectLayout.java
index 0be099af..1a60d135 100644
--- a/src/de/blinkt/openvpn/FileSelectLayout.java
+++ b/src/de/blinkt/openvpn/FileSelectLayout.java
@@ -19,6 +19,8 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener {
 	private Fragment mFragment;
 	private int mTaskId;
 	private Button mSelectButton;
+	private boolean mNoInline;
+	private String mTitle;
 
 	public FileSelectLayout( Context context,AttributeSet attrset) {
 		super(context,attrset);
@@ -26,10 +28,10 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener {
 		
 		TypedArray ta = context.obtainStyledAttributes(attrset,R.styleable.FileSelectLayout);
 		
-		String title = ta.getString(R.styleable.FileSelectLayout_title);
+		mTitle = ta.getString(R.styleable.FileSelectLayout_title);
 		
 		TextView tview = (TextView) findViewById(R.id.file_title);
-		tview.setText(title);
+		tview.setText(mTitle);
 		
 		mDataView = (TextView) findViewById(R.id.file_selected_item);
 		mSelectButton = (Button) findViewById(R.id.file_select_button);
@@ -46,7 +48,9 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener {
 	public void getCertificateFileDialog() {
 		Intent startFC = new Intent(getContext(),FileSelect.class);
 		startFC.putExtra(FileSelect.START_DATA, mData);
-		
+		startFC.putExtra(FileSelect.WINDOW_TITLE,mTitle);
+		if(mNoInline)
+			startFC.putExtra(FileSelect.NO_INLINE_SELECTION, true);
 		mFragment.startActivityForResult(startFC,mTaskId);
 	}
 
@@ -73,5 +77,9 @@ public class FileSelectLayout extends LinearLayout implements OnClickListener {
 		}
 	}
 
+	public void setNoline() {
+		mNoInline=true;
+	}
+
 	
 }