diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-29 03:24:42 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-29 03:24:42 +0100 |
commit | ecf6fc26c5139f6e3ce593e59c4d1ad79c1f3f2a (patch) | |
tree | a75dca6a378a52f3577c0864c214e35290c8dc73 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |
parent | f276455624126f1e25b9648c3a2883f8b28b4445 (diff) | |
download | open-keychain-ecf6fc26c5139f6e3ce593e59c4d1ad79c1f3f2a.tar.gz open-keychain-ecf6fc26c5139f6e3ce593e59c4d1ad79c1f3f2a.tar.bz2 open-keychain-ecf6fc26c5139f6e3ce593e59c4d1ad79c1f3f2a.zip |
Use intent data instead of IDs for upload and sign, fixes #205
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 18 |
1 files changed, 2 insertions, 16 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 26d0e8bc7..f5ad69e99 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 @@ -382,11 +382,8 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements } private void uploadToKeyserver(Uri dataUri) { - long keyRingRowId = Long.valueOf(dataUri.getLastPathSegment()); - Intent uploadIntent = new Intent(this, KeyServerUploadActivity.class); - uploadIntent.setAction(KeyServerUploadActivity.ACTION_EXPORT_KEY_TO_SERVER); - uploadIntent.putExtra(KeyServerUploadActivity.EXTRA_KEYRING_ROW_ID, (int) keyRingRowId); + uploadIntent.setData(mDataUri); startActivityForResult(uploadIntent, Id.request.export_to_server); } @@ -412,19 +409,8 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements } private void signKey(Uri dataUri) { - long keyId = 0; - PGPPublicKeyRing signKey = (PGPPublicKeyRing) ProviderHelper.getPGPKeyRing(this, dataUri); - - if (signKey != null) { - keyId = PgpKeyHelper.getMasterKey(signKey).getKeyID(); - } - if (keyId == 0) { - Log.e(Constants.TAG, "this shouldn't happen. KeyId == 0!"); - return; - } - Intent signIntent = new Intent(this, SignKeyActivity.class); - signIntent.putExtra(SignKeyActivity.EXTRA_KEY_ID, keyId); + signIntent.setData(mDataUri); startActivity(signIntent); } |