summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-09-04 10:02:40 +0200
committerArne Schwabe <arne@rfc2549.org>2012-09-04 10:02:40 +0200
commiteda65441e922d6a07c58b63ff18025469818bf2d (patch)
treedc00c53b10f079621a18ef5380ac30f5386b7a5a
parent60fbd224d898f6878b301a58951ae646eb813cd5 (diff)
parentfc9d71333b5673e1792d6f833b36125d301751b4 (diff)
Merge
-rw-r--r--AndroidManifest.xml3
-rw-r--r--src/de/blinkt/openvpn/FileSelect.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16988bb1..dfa01a6a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,9 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+
<!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/de/blinkt/openvpn/FileSelect.java
index 30d6628e..b76dbc93 100644
--- a/src/de/blinkt/openvpn/FileSelect.java
+++ b/src/de/blinkt/openvpn/FileSelect.java
@@ -152,7 +152,7 @@ public class FileSelect extends Activity {
if(!mData.startsWith(VpnProfile.INLINE_TAG))
return mData;
else
- return "/mnt/sdcard";
+ return Environment.getExternalStorageDirectory().getPath();
}
public CharSequence getInlineData() {