From 1dbb3db32020a3e5cd440998f1b3aac116285952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 4 Oct 2014 23:47:17 +0200 Subject: Display result in multi certify --- .../main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java') 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..f806880ba 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java @@ -385,7 +385,7 @@ 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()); startActivity(certifyIntent); -- cgit v1.2.3 From d99115c26315d0d1df2ef638f60d5caca5269096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 5 Oct 2014 01:23:34 +0200 Subject: preselect certify key --- .../main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java') 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 f806880ba..791c44503 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java @@ -387,6 +387,7 @@ public class AddKeysActivity extends ActionBarActivity implements Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class); 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 selectedEntries = new ArrayList(); selectedEntries.add(keyEntry); -- cgit v1.2.3