diff options
5 files changed, 18 insertions, 10 deletions
diff --git a/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java index 51998a33e..93bcee8f6 100644 --- a/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java @@ -21,5 +21,4 @@ public class Constants { public static final String KEYCHAIN_PACKAGE_NAME = "org.sufficientlysecure.keychain"; public static final int MIN_REQUIRED_VERSION = 50; - } diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index 2c3f24275..f156f6d47 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -88,6 +88,7 @@ <application android:name=".KeychainApplication" + android:allowBackup="false" android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" @@ -137,9 +138,11 @@ android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="stateHidden" > <intent-filter> - <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEY" /> <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEY" /> + <!-- With permission ACCESS_API: --> + <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEY" /> + <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> @@ -191,8 +194,11 @@ <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_FILE" /> + + <!-- With permission ACCESS_API: --> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_AND_RETURN" /> - <action android:name="org.sufficientlysecure.keychain.action.GENERATE_SIGNATURE" /> + <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_STREAM_AND_RETURN" /> + <action android:name="org.sufficientlysecure.keychain.action.GENERATE_SIGNATURE_AND_RETURN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -218,7 +224,10 @@ <intent-filter> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_FILE" /> + + <!-- With permission ACCESS_API: --> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_AND_RETURN" /> + <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_STREAM_AND_RETURN" /> <category android:name="android.intent.category.DEFAULT" /> 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"; @@ -96,8 +96,10 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al * CREATE_KEY * ENCRYPT_AND_RETURN -* GENERATE_SIGNATURE +* ENCRYPT_STREAM_AND_RETURN +* GENERATE_SIGNATURE_AND_RETURN * DECRYPT_AND_RETURN +* DECRYPT_STREAM_AND_RETURN ## Content Provider |