summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/build.gradle3
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Utils.java7
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),