mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-04 16:15:09 +00:00
Code Issues Releases Wiki Activity

Fixed certificate fingerprint formatting

Browse Source
This commit is contained in:
Vineet Garg
2015-07-19 19:10:09 +05:30
parent b084c8653e
commit f7f00057c9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -63,8 +63,8 @@
<string name="error_invalid_key">Invalid key received</string> <string name="error_invalid_key">Invalid key received</string>
<string name="encryption_info_title">Encryption Info</string> <string name="encryption_info_title">Encryption Info</string>
<string name="encryption_info_msg_no_ssl">The other device doesn\'t use a recent version of KDE Connect, using the legacy encryption method.</string> <string name="encryption_info_msg_no_ssl">The other device doesn\'t use a recent version of KDE Connect, using the legacy encryption method.</string>
<string name="my_device_key">My device key : </string> <string name="my_device_fingerprint">SHA1 fingerprint of your device certificate is : </string>
<string name="remote_device_key">Remote device key : </string> <string name="remote_device_fingerprint">SHA1 fingerprint of remote device certificate is : </string>
<string name="pair_requested">Pair requested</string> <string name="pair_requested">Pair requested</string>
<string name="pairing_request_from">Pairing request from %1s</string> <string name="pairing_request_from">Pairing request from %1s</string>
<string name="received_url_title">Received link from %1s</string> <string name="received_url_title">Received link from %1s</string>

2
src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
View File

@@ -228,7 +228,7 @@ public class SslHelper {
formatter.format("%02x:", hash[i]); formatter.format("%02x:", hash[i]);
} }
formatter.format("%02x", hash[i]); formatter.format("%02x", hash[i]);
return formatter.toString().toUpperCase(); return formatter.toString();
} catch (Exception e) { } catch (Exception e) {
return null; return null;
} }

4
src/org/kde/kdeconnect/UserInterface/PairActivity.java
View File

@@ -197,8 +197,8 @@ public class PairActivity extends ActionBarActivity {
if (device.certificate == null) { if (device.certificate == null) {
builder.setMessage(R.string.encryption_info_msg_no_ssl); builder.setMessage(R.string.encryption_info_msg_no_ssl);
} else { } else {
builder.setMessage(context.getResources().getString(R.string.my_device_key) + " " + SslHelper.getCertificateHash(SslHelper.certificate) + "\n" builder.setMessage(context.getResources().getString(R.string.my_device_fingerprint) + " " + SslHelper.getCertificateHash(SslHelper.certificate) + "\n\n"
+ context.getResources().getString(R.string.remote_device_key) + " " + SslHelper.getCertificateHash(device.certificate)); + context.getResources().getString(R.string.remote_device_fingerprint) + " " + SslHelper.getCertificateHash(device.certificate));
} }
builder.create().show(); builder.create().show();
return true; return true;