moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Key lookup for API

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-03 15:18:05 +02:00
parent 09411a62fa
commit 04b0425d45
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@ -356,11 +356,10 @@ public class OpenPgpService extends RemoteService {
// If keys are not in db we return an additional PendingIntent // If keys are not in db we return an additional PendingIntent
// to retrieve the missing key // to retrieve the missing key
// TODO!!! Intent intent = new Intent(getBaseContext(), ImportKeysActivity.class);
Intent intent = new Intent(getBaseContext(), RemoteServiceActivity.class); intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN);
intent.setAction(RemoteServiceActivity.ACTION_ERROR_MESSAGE); intent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, keyId);
intent.putExtra(RemoteServiceActivity.EXTRA_ERROR_MESSAGE, "todo"); intent.putExtra(ImportKeysActivity.EXTRA_PENDING_INTENT_DATA, data);
intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0, PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
intent, intent,
@ -372,6 +371,9 @@ public class OpenPgpService extends RemoteService {
} else { } else {
Intent result = new Intent(); Intent result = new Intent();
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS); result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS);
// TODO: also return PendingIntent that opens the key view activity
return result; return result;
} }
} catch (Exception e) { } catch (Exception e) {

2
OpenPGP-Keychain/src/main/res/raw/help_changelog.html
View File

@ -9,7 +9,7 @@ And don't add newlines before or after p tags because of transifex -->
<ul> <ul>
<li>fix decryption of symmetric pgp messages/files</li> <li>fix decryption of symmetric pgp messages/files</li>
<li>refactored edit key screen (thanks to Ash Hughes)</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> <li>new modern design for encrypt/decrypt screens</li>
</ul> </ul>