diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 23:47:17 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 23:47:17 +0200 |
| commit | 1dbb3db32020a3e5cd440998f1b3aac116285952 (patch) | |
| tree | 0e5a3fa617c1929b72e01a9530e3a97daa90b773 /OpenKeychain/src | |
| parent | 4b372a5c333a32c5a011e50d9066267d609cffba (diff) | |
| download | open-keychain-1dbb3db32020a3e5cd440998f1b3aac116285952.tar.gz open-keychain-1dbb3db32020a3e5cd440998f1b3aac116285952.tar.bz2 open-keychain-1dbb3db32020a3e5cd440998f1b3aac116285952.zip | |
Display result in multi certify
Diffstat (limited to 'OpenKeychain/src')
3 files changed, 9 insertions, 1 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..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); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyActivity.java index 6b882f7ce..afb23ef64 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyActivity.java @@ -28,6 +28,7 @@ import org.sufficientlysecure.keychain.R; */ public class MultiCertifyKeyActivity extends ActionBarActivity { + public static final String EXTRA_RESULT = "operation_result"; public static final String EXTRA_KEY_IDS = "extra_key_ids"; @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java index 616ea59b7..339f7b29b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java @@ -53,6 +53,7 @@ import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.service.results.CertifyResult; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.ui.adapter.MultiUserIdsAdapter; import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment; import org.sufficientlysecure.keychain.ui.util.Notify; @@ -105,6 +106,12 @@ public class MultiCertifyKeyFragment extends LoaderFragment return; } + OperationResult result = mActivity.getIntent().getParcelableExtra(MultiCertifyKeyActivity.EXTRA_RESULT); + if (result != null) { + // display result from import + result.createNotify(mActivity).show(); + } + mUserIdsAdapter = new MultiUserIdsAdapter(mActivity, null, 0); mUserIds.setAdapter(mUserIdsAdapter); |