diff options
| author | cyBerta <cyberta@riseup.net> | 2019-10-08 02:07:20 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2019-10-08 02:07:20 +0200 |
| commit | 6a8b68e68ce831c1aa4d9b4af0bae9ee558acd42 (patch) | |
| tree | d87977ae9083d02a8da9a7e40ac6c3854afc3116 | |
| parent | 5dd634f466ba6df04728258b9f18a796e34c97bb (diff) | |
set target sdk version to API 28, fix related issues (#8959)
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index 91cbeed1..5d98e2e4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { versionCode 141 versionName "1.0.1" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 vectorDrawables.useSupportLibrary = true buildConfigField 'boolean', 'openvpn3', 'false' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9a2b1e43..9e8c0d98 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,7 @@ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/> diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java index da74c7c4..d0c0ce0c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java @@ -116,7 +116,7 @@ public class ConfigHelper { public static RSAPrivateKey parseRsaKeyFromString(String rsaKeyString) { RSAPrivateKey key; try { - KeyFactory kf = KeyFactory.getInstance("RSA", "BC"); + KeyFactory kf = KeyFactory.getInstance("RSA"); rsaKeyString = rsaKeyString.replaceFirst("-----BEGIN RSA PRIVATE KEY-----", "").replaceFirst("-----END RSA PRIVATE KEY-----", ""); PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(Base64.decode(rsaKeyString)); key = (RSAPrivateKey) kf.generatePrivate(keySpec); @@ -128,10 +128,6 @@ public class ConfigHelper { // TODO Auto-generated catch block e.printStackTrace(); return null; - } catch (NoSuchProviderException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - return null; } catch (NullPointerException e) { e.printStackTrace(); return null; |