diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-17 01:48:57 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-17 01:48:57 +0100 |
| commit | 40f2355b1ac932d6b8a498c1bcabc9281dabc562 (patch) | |
| tree | b16d235739f8fcf5331de306bea19a28faa67d8d /OpenPGP-Keychain/src | |
| parent | 6d0192321eace6b01a9a8ea909798873563dd078 (diff) | |
| download | open-keychain-40f2355b1ac932d6b8a498c1bcabc9281dabc562.tar.gz open-keychain-40f2355b1ac932d6b8a498c1bcabc9281dabc562.tar.bz2 open-keychain-40f2355b1ac932d6b8a498c1bcabc9281dabc562.zip | |
Intent action fixes
Diffstat (limited to 'OpenPGP-Keychain/src')
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl | 6 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl index ac8327b8e..575f6e1d2 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl @@ -45,8 +45,7 @@ interface IKeychainApiService { * 7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5, * 6: DES, 2: Triple DES, 1: IDEA * @param handler - * Results are returned to this IKeychainEncryptDecryptHandler Handler - * to onSuccessEncrypt(in byte[] output), after successful encryption + * Results are returned to this Handler after successful encryption */ oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm, @@ -90,8 +89,7 @@ interface IKeychainApiService { * @param signaturePassphrase * Passphrase to unlock signature key * @param handler - * Results are returned to this IKeychainEncryptDecryptHandler Handler - * to onSuccessEncrypt(in byte[] output), after successful encryption and signing + * Results are returned to this Handler after successful encryption and signing */ oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds, diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java index bb61fb890..9d73fc6e5 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -78,10 +78,10 @@ public class EncryptActivity extends SherlockFragmentActivity { // with permission public static final String ACTION_ENCRYPT_AND_RETURN = Constants.INTENT_PREFIX + "ENCRYPT_AND_RETURN"; - public static final String ACTION_GENERATE_SIGNATURE_AND_RETURN = Constants.INTENT_PREFIX - + "GENERATE_SIGNATURE_AND_RETURN"; public static final String ACTION_ENCRYPT_STREAM_AND_RETURN = Constants.INTENT_PREFIX + "ENCRYPT_STREAM_AND_RETURN"; + public static final String ACTION_GENERATE_SIGNATURE_AND_RETURN = Constants.INTENT_PREFIX + + "GENERATE_SIGNATURE_AND_RETURN"; /* EXTRA keys for input */ public static final String EXTRA_TEXT = "text"; |