diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:18:05 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-03 15:18:05 +0200 |
| commit | 04b0425d45574cdf86219898ea25ce15c33341a7 (patch) | |
| tree | b5e0d9f0f32f6d4b3e6c4ac61c3a2ddd72c6c904 | |
| parent | 09411a62fab849c345033a5d14d1e629855209df (diff) | |
| download | open-keychain-04b0425d45574cdf86219898ea25ce15c33341a7.tar.gz open-keychain-04b0425d45574cdf86219898ea25ce15c33341a7.tar.bz2 open-keychain-04b0425d45574cdf86219898ea25ce15c33341a7.zip | |
Key lookup for API
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 12 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/raw/help_changelog.html | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 9cdd16e23..dc19bc5bb 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -356,11 +356,10 @@ public class OpenPgpService extends RemoteService { // If keys are not in db we return an additional PendingIntent // to retrieve the missing key - // TODO!!! - Intent intent = new Intent(getBaseContext(), RemoteServiceActivity.class); - intent.setAction(RemoteServiceActivity.ACTION_ERROR_MESSAGE); - intent.putExtra(RemoteServiceActivity.EXTRA_ERROR_MESSAGE, "todo"); - intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data); + Intent intent = new Intent(getBaseContext(), ImportKeysActivity.class); + intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN); + intent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, keyId); + intent.putExtra(ImportKeysActivity.EXTRA_PENDING_INTENT_DATA, data); PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0, intent, @@ -372,6 +371,9 @@ public class OpenPgpService extends RemoteService { } else { Intent result = new Intent(); result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS); + + // TODO: also return PendingIntent that opens the key view activity + return result; } } catch (Exception e) { diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html index 8138fd0bd..221705579 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html @@ -9,7 +9,7 @@ And don't add newlines before or after p tags because of transifex --> <ul> <li>fix decryption of symmetric pgp messages/files</li> <li>refactored edit key screen (thanks to Ash Hughes)</li> -<li>OpenPGP API version 3 (multiple api accounts, internal fixes)</li> +<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li> <li>new modern design for encrypt/decrypt screens</li> </ul> |