diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-01 22:06:57 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-01 22:06:57 +0100 |
| commit | 20af0d3b2e3d9a0d44750828c41fc72881468fe3 (patch) | |
| tree | 94b0cf99579cf32c3ff5e6797cf9dd83f0d9e349 /OpenPGP-Keychain | |
| parent | 4e324598244a496f8952b00065be34841b415f8b (diff) | |
| download | open-keychain-20af0d3b2e3d9a0d44750828c41fc72881468fe3.tar.gz open-keychain-20af0d3b2e3d9a0d44750828c41fc72881468fe3.tar.bz2 open-keychain-20af0d3b2e3d9a0d44750828c41fc72881468fe3.zip | |
Fix QR Code URI
Diffstat (limited to 'OpenPGP-Keychain')
2 files changed, 4 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index b837a09d0..5fb4c90d6 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -417,7 +417,7 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements byte[] fingerprintBlob = ProviderHelper.getFingerprint(this, dataUri); String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, false); - content = Constants.FINGERPRINT_SCHEME + fingerprint; + content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint; } else { // get public keyring as ascii armored string long masterKeyId = ProviderHelper.getMasterKeyId(this, dataUri); diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java index 833f9714d..7594a9aed 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java @@ -90,16 +90,14 @@ public class ShareQrCodeDialogFragment extends SherlockDialogFragment { String content = null; if (mFingerprintOnly) { + alert.setPositiveButton(R.string.btn_okay, null); + byte[] fingerprintBlob = ProviderHelper.getFingerprint(getActivity(), dataUri); String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, false); mText.setText(getString(R.string.share_qr_code_dialog_fingerprint_text) + " " + fingerprint); - content = Constants.FINGERPRINT_SCHEME + fingerprint; - - Log.d(Constants.TAG, "content: " + content); - - alert.setPositiveButton(R.string.btn_okay, null); + content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint; setQrCode(content); } else { mText.setText(R.string.share_qr_code_dialog_start); @@ -107,7 +105,6 @@ public class ShareQrCodeDialogFragment extends SherlockDialogFragment { // TODO long masterKeyId = ProviderHelper.getMasterKeyId(getActivity(), dataUri); - // get public keyring as ascii armored string ArrayList<String> keyringArmored = ProviderHelper.getKeyRingsAsArmoredString( getActivity(), dataUri, new long[]{masterKeyId}); |