mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-31 06:05:12 +00:00
Code Issues Releases Wiki Activity

Handle the case where there is no publicKey stored (for protocol v6)

Browse Source
This commit is contained in:
Albert Vaca
2016-02-12 08:37:47 -08:00
parent c927af4bf3
commit 98ef6aec8c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/kde/kdeconnect/Device.java
View File

@@ -150,12 +150,14 @@ public class Device implements BaseLink.PackageReceiver {
this.deviceType = DeviceType.FromString(settings.getString("deviceType", "desktop"));
try {
byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
String publicKeyStr = settings.getString("publicKey", null);
if (publicKeyStr != null) {
byte[] publicKeyBytes = Base64.decode(publicKeyStr, 0);
publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
}
} catch (Exception e) {
e.printStackTrace();
//Do not unpair, they may be paired in some other way
Log.e("KDE/Device","Exception");
Log.e("KDE/Device","Exception deserializing stored public key for device");
}
reloadPluginsFromSettings();
@@ -543,7 +545,8 @@ public class Device implements BaseLink.PackageReceiver {
try {
ph.packageReceived(np);
} catch (Exception e) {
// There should be no exception here
e.printStackTrace();
Log.e("PairingPackageReceived","Exception");
}
}