diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-05 01:22:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-05 01:22:01 +0200 |
| commit | 60fb3b60a8016d69e8b1c67b979674712799beac (patch) | |
| tree | ad708e8fed11b5403ec93a8d8a720c1643aead92 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java | |
| parent | dff68ac194d71d8a283ec80a1e8640da3bfd3e44 (diff) | |
| parent | d99115c26315d0d1df2ef638f60d5caca5269096 (diff) | |
| download | open-keychain-60fb3b60a8016d69e8b1c67b979674712799beac.tar.gz open-keychain-60fb3b60a8016d69e8b1c67b979674712799beac.tar.bz2 open-keychain-60fb3b60a8016d69e8b1c67b979674712799beac.zip | |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java | 5 |
1 files changed, 3 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 e2393c722..791c44503 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java @@ -385,8 +385,9 @@ public class AddKeysActivity extends ActionBarActivity implements finish(); Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class); - certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result); + certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_RESULT, result); certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds()); + certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_CERTIFY_KEY_ID, mExchangeMasterKeyId); startActivity(certifyIntent); result.createNotify(AddKeysActivity.this).show(); @@ -448,7 +449,7 @@ public class AddKeysActivity extends ActionBarActivity implements final ImportKeysListEntry keyEntry = new ImportKeysListEntry(); keyEntry.setFingerprintHex(fingerprint); - keyEntry.setBitStrength(1337); + keyEntry.setBitStrength(1337); // TODO: make optional! keyEntry.addOrigin(cloudPrefs.keyserver); ArrayList<ImportKeysListEntry> selectedEntries = new ArrayList<ImportKeysListEntry>(); selectedEntries.add(keyEntry); |