summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/de/blinkt/openvpn/activities/ConfigConverter.java3
-rw-r--r--src/de/blinkt/openvpn/activities/FileSelect.java19
-rw-r--r--src/de/blinkt/openvpn/fragments/InlineFileTab.java2
3 files changed, 14 insertions, 10 deletions
diff --git a/src/de/blinkt/openvpn/activities/ConfigConverter.java b/src/de/blinkt/openvpn/activities/ConfigConverter.java
index 792c9796..cc84076d 100644
--- a/src/de/blinkt/openvpn/activities/ConfigConverter.java
+++ b/src/de/blinkt/openvpn/activities/ConfigConverter.java
@@ -329,7 +329,8 @@ public class ConfigConverter extends ListActivity implements FileSelectCallback
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, 1);
+ ((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);
diff --git a/src/de/blinkt/openvpn/activities/FileSelect.java b/src/de/blinkt/openvpn/activities/FileSelect.java
index 8967b1bf..511dc736 100644
--- a/src/de/blinkt/openvpn/activities/FileSelect.java
+++ b/src/de/blinkt/openvpn/activities/FileSelect.java
@@ -128,18 +128,18 @@ public class FileSelect extends Activity {
String data = "";
- byte[] filedata = readBytesFromFile(ifile) ;
+ byte[] fileData = readBytesFromFile(ifile) ;
if(mBase64Encode)
- data += Base64.encodeToString(filedata, Base64.DEFAULT);
+ data += Base64.encodeToString(fileData, Base64.DEFAULT);
else
- data += new String(filedata);
+ data += new String(fileData);
mData =data;
/*
mInlineFragment.setData(data);
getActionBar().selectTab(inlineFileTab); */
- saveInlineData(data);
+ saveInlineData(ifile.getName(), data);
} catch (FileNotFoundException e) {
fe = e;
} catch (IOException e) {
@@ -206,11 +206,14 @@ public class FileSelect extends Activity {
}
- public void saveInlineData(String string) {
+ public void saveInlineData(String fileName, String string) {
Intent intent = new Intent();
-
- intent.putExtra(RESULT_DATA,VpnProfile.INLINE_TAG + string);
- setResult(Activity.RESULT_OK,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/src/de/blinkt/openvpn/fragments/InlineFileTab.java b/src/de/blinkt/openvpn/fragments/InlineFileTab.java
index bd0b70b1..bea22442 100644
--- a/src/de/blinkt/openvpn/fragments/InlineFileTab.java
+++ b/src/de/blinkt/openvpn/fragments/InlineFileTab.java
@@ -57,7 +57,7 @@ public class InlineFileTab extends Fragment
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if(item.getItemId()==MENU_SAVE){
- ((FileSelect)getActivity()).saveInlineData(mInlineData.getText().toString());
+ ((FileSelect)getActivity()).saveInlineData(null, mInlineData.getText().toString());
return true;
}
return super.onOptionsItemSelected(item);