diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-02-06 21:09:18 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-02-06 21:09:18 +0100 |
| commit | b6386e685176add87a06943d34bf01d8cd1dbea4 (patch) | |
| tree | 3368e1911439cfe139f1c22fe659f1de5160aa36 | |
| parent | 8ad6cd40e27396a7ab50c011b74d5c7f3fa174c0 (diff) | |
Fix embedding inline files (closes issue #141)
increase version number
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/FileSelect.java | 3 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/InlineFileTab.java | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b59436e7..ce640f7e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.blinkt.openvpn" android:versionCode="58" - android:versionName="0.5.30" > + android:versionName="0.5.31" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java index b6239433..18448706 100644 --- a/src/de/blinkt/openvpn/FileSelect.java +++ b/src/de/blinkt/openvpn/FileSelect.java @@ -199,7 +199,8 @@ public class FileSelect extends Activity { public void saveInlineData(String string) { Intent intent = new Intent(); - intent.putExtra(RESULT_DATA, string); + + intent.putExtra(RESULT_DATA,VpnProfile.INLINE_TAG + string); setResult(Activity.RESULT_OK,intent); finish(); diff --git a/src/de/blinkt/openvpn/InlineFileTab.java b/src/de/blinkt/openvpn/InlineFileTab.java index 1104d290..47c02a09 100644 --- a/src/de/blinkt/openvpn/InlineFileTab.java +++ b/src/de/blinkt/openvpn/InlineFileTab.java @@ -19,7 +19,6 @@ public class InlineFileTab extends Fragment @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - mInlineData.setText(((FileSelect)getActivity()).getInlineData()); } |