diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-03-09 13:05:50 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-03-09 13:05:50 +0100 |
| commit | a0be242ffc728d75f8fa5b583dfac836e8c071c5 (patch) | |
| tree | 19b3622103c0815643817ec365db052a2597a52d | |
| parent | 0f2dd21b8c647b9e8ecc8ec35422fcccd6f2c8fc (diff) | |
Disable ABI building for now, always use DOCUMENT_OPEN intent
| -rw-r--r-- | main/build.gradle | 3 | ||||
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/fragments/Utils.java | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/main/build.gradle b/main/build.gradle index 12a23059..63cd45fa 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -57,7 +57,7 @@ android { } } - + /* productFlavors { x86 { versionCode Integer.parseInt("6" + defaultConfig.versionCode) @@ -89,6 +89,7 @@ android { fat } + */ } diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java index b4ba476b..fc86243a 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java @@ -22,6 +22,8 @@ import java.util.Vector; public class Utils { + + @TargetApi(Build.VERSION_CODES.KITKAT) public static Intent getFilePickerIntent(Context c, FileType fileType) { Intent i = new Intent(Intent.ACTION_GET_CONTENT); i.addCategory(Intent.CATEGORY_OPENABLE); @@ -102,7 +104,8 @@ public class Utils { /* fist try with documentsui */ i.setPackage("com.android.documentsui"); - if (!isIntentAvailable(c,i)) { + //noinspection ConstantConditions + if (true || !isIntentAvailable(c,i)) { i.setAction(Intent.ACTION_OPEN_DOCUMENT); i.setPackage(null); } @@ -118,6 +121,8 @@ public class Utils { PackageManager.MATCH_DEFAULT_ONLY); return list.size() > 0; } + + public enum FileType { PKCS12(0), CLIENT_CERTIFICATE(1), |