summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2016-04-27 08:22:41 +0300
committerArne Schwabe <arne@rfc2549.org>2016-04-27 08:22:41 +0300
commit9498eb76ef4c053d77e45d4d3ebaf839e0f40a0b (patch)
treeed70908e71486734d49912cb08b4a661e371bb81
parent61b1c46c460e1ba3a7e905854a1394d2d507c9a9 (diff)
add a few more mime types (closes #481)
-rw-r--r--build.gradle2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Utils.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index 644795c2..4c697cda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.0-alpha5'
+ classpath 'com.android.tools.build:gradle:2.1.0'
}
}
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 243eae98..af76ee7a 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
@@ -49,10 +49,12 @@ public class Utils {
supportedMimeTypes.add("application/x-x509-ca-cert");
supportedMimeTypes.add("application/x-x509-user-cert");
supportedMimeTypes.add("application/x-pem-file");
+ supportedMimeTypes.add("application/pkix-cert");
supportedMimeTypes.add("text/plain");
extensions.add("pem");
extensions.add("crt");
+ extensions.add("cer");
break;
case KEYFILE:
i.setType("application/x-pem-file");
@@ -86,6 +88,10 @@ public class Utils {
extensions.add("conf");
break;
+ case CRL_FILE:
+ supportedMimeTypes.add("application/x-pkcs7-crl");
+ supportedMimeTypes.add("application/pkix-crl");
+
case USERPW_FILE:
i.setType("text/plain");
supportedMimeTypes.add("text/plain");