diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 23:31:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-04 23:31:04 +0200 |
| commit | 4b372a5c333a32c5a011e50d9066267d609cffba (patch) | |
| tree | 4f2f49e26087e437cbc99909255d9422e43c4b64 /OpenKeychain/src/main/java | |
| parent | f96f289891cb1e4e700ff010f15a592d7c5a0959 (diff) | |
| parent | 4fcd58b9f89cc64e489be695a633a86abf92a46e (diff) | |
| download | open-keychain-4b372a5c333a32c5a011e50d9066267d609cffba.tar.gz open-keychain-4b372a5c333a32c5a011e50d9066267d609cffba.tar.bz2 open-keychain-4b372a5c333a32c5a011e50d9066267d609cffba.zip | |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java index 479a874d9..e2393c722 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java @@ -384,9 +384,9 @@ public class AddKeysActivity extends ActionBarActivity implements } finish(); - Intent certifyIntent = new Intent(); // TODO: certify + Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class); certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result); - certifyIntent.putExtra("key ids", result.getImportedMasterKeyIds()); // TODO: extra + certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds()); startActivity(certifyIntent); result.createNotify(AddKeysActivity.this).show(); |