moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-02 13:32:19 -05:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java
View File

@ -21,5 +21,4 @@ public class Constants {
public static final String KEYCHAIN_PACKAGE_NAME = "org.sufficientlysecure.keychain"; public static final String KEYCHAIN_PACKAGE_NAME = "org.sufficientlysecure.keychain";
public static final int MIN_REQUIRED_VERSION = 50; public static final int MIN_REQUIRED_VERSION = 50;
} }

13
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -88,6 +88,7 @@
<application <application
android:name=".KeychainApplication" android:name=".KeychainApplication"
android:allowBackup="false"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:icon="@drawable/icon" android:icon="@drawable/icon"
android:label="@string/app_name" android:label="@string/app_name"
@ -137,9 +138,11 @@
android:uiOptions="splitActionBarWhenNarrow" android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
<intent-filter> <intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.CREATE_KEY" />
<action android:name="org.sufficientlysecure.keychain.action.EDIT_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" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -191,8 +194,11 @@
<intent-filter> <intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" /> <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" />
<action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_FILE" /> <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.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" /> <category android:name="android.intent.category.DEFAULT" />
@ -218,7 +224,10 @@
<intent-filter> <intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.DECRYPT" /> <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
<action android:name="org.sufficientlysecure.keychain.action.DECRYPT_FILE" /> <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_AND_RETURN" />
<action android:name="org.sufficientlysecure.keychain.action.DECRYPT_STREAM_AND_RETURN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

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, * 7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5,
* 6: DES, 2: Triple DES, 1: IDEA * 6: DES, 2: Triple DES, 1: IDEA
* @param handler * @param handler
* Results are returned to this IKeychainEncryptDecryptHandler Handler * Results are returned to this Handler after successful encryption
* to onSuccessEncrypt(in byte[] output), after successful encryption
*/ */
oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor, oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm, in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm,
@ -90,8 +89,7 @@ interface IKeychainApiService {
* @param signaturePassphrase * @param signaturePassphrase
* Passphrase to unlock signature key * Passphrase to unlock signature key
* @param handler * @param handler
* Results are returned to this IKeychainEncryptDecryptHandler Handler * Results are returned to this Handler after successful encryption and signing
* to onSuccessEncrypt(in byte[] output), after successful encryption and signing
*/ */
oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri, oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri,
in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds, 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 // with permission
public static final String ACTION_ENCRYPT_AND_RETURN = Constants.INTENT_PREFIX public static final String ACTION_ENCRYPT_AND_RETURN = Constants.INTENT_PREFIX
+ "ENCRYPT_AND_RETURN"; + "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 public static final String ACTION_ENCRYPT_STREAM_AND_RETURN = Constants.INTENT_PREFIX
+ "ENCRYPT_STREAM_AND_RETURN"; + "ENCRYPT_STREAM_AND_RETURN";
public static final String ACTION_GENERATE_SIGNATURE_AND_RETURN = Constants.INTENT_PREFIX
+ "GENERATE_SIGNATURE_AND_RETURN";
/* EXTRA keys for input */ /* EXTRA keys for input */
public static final String EXTRA_TEXT = "text"; public static final String EXTRA_TEXT = "text";

4
README.md
View File

@ -96,8 +96,10 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al
* CREATE_KEY * CREATE_KEY
* ENCRYPT_AND_RETURN * ENCRYPT_AND_RETURN
* GENERATE_SIGNATURE * ENCRYPT_STREAM_AND_RETURN
* GENERATE_SIGNATURE_AND_RETURN
* DECRYPT_AND_RETURN * DECRYPT_AND_RETURN
* DECRYPT_STREAM_AND_RETURN
## Content Provider ## Content Provider