cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Intent action fixes

Browse Source
This commit is contained in:
Dominik Schürmann
2013-01-17 01:48:57 +01:00
parent 6d0192321e
commit 40f2355b1a
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl
View File

@@ -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,

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
View File

@@ -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";