summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2019-10-08 02:07:20 +0200
committercyBerta <cyberta@riseup.net>2019-10-08 02:07:20 +0200
commit6a8b68e68ce831c1aa4d9b4af0bae9ee558acd42 (patch)
treed87977ae9083d02a8da9a7e40ac6c3854afc3116 /app/src
parent5dd634f466ba6df04728258b9f18a796e34c97bb (diff)
set target sdk version to API 28, fix related issues (#8959)
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/AndroidManifest.xml1
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/utils/ConfigHelper.java6
2 files changed, 2 insertions, 5 deletions
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;