moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

rename intent actions to use KEYRING instead of KEY

This commit is contained in:
Dominik Schürmann 2013-01-17 01:53:49 +01:00
parent 40f2355b1a
commit f334dea1b5
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java
View File

@ -56,14 +56,16 @@ public class KeychainIntentHelper {
/**
* Select keys, without permission
*/
public static final String ACTION_SELECT_PUBLIC_KEYS = APG_INTENT_PREFIX + "SELECT_PUBLIC_KEYS";
public static final String ACTION_SELECT_SECRET_KEY = APG_INTENT_PREFIX + "SELECT_SECRET_KEY";
public static final String ACTION_SELECT_PUBLIC_KEYS = APG_INTENT_PREFIX
+ "SELECT_PUBLIC_KEYRINGS";
public static final String ACTION_SELECT_SECRET_KEY = APG_INTENT_PREFIX
+ "SELECT_SECRET_KEYRING";
/**
* Create key/edit key, without permission
*/
public static final String ACTION_CREATE_KEY = APG_INTENT_PREFIX + "CREATE_KEY";
public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEY";
public static final String ACTION_CREATE_KEY = APG_INTENT_PREFIX + "CREATE_KEYRING";
public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEYRING";
/**
* Import actions

8
OpenPGP-Keychain/AndroidManifest.xml
View File

@ -138,10 +138,10 @@
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="stateHidden" >
<intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.EDIT_KEY" />
<action android:name="org.sufficientlysecure.keychain.action.EDIT_KEYRING" />
<!-- With permission ACCESS_API: -->
<action android:name="org.sufficientlysecure.keychain.action.CREATE_KEY" />
<action android:name="org.sufficientlysecure.keychain.action.CREATE_KEYRING" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@ -153,7 +153,7 @@
android:launchMode="singleTop"
android:uiOptions="splitActionBarWhenNarrow" >
<intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.SELECT_PUBLIC_KEYS" />
<action android:name="org.sufficientlysecure.keychain.action.SELECT_PUBLIC_KEYRINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@ -171,7 +171,7 @@
android:label="@string/title_selectSignature"
android:launchMode="singleTop" >
<intent-filter>
<action android:name="org.sufficientlysecure.keychain.action.SELECT_SECRET_KEY" />
<action android:name="org.sufficientlysecure.keychain.action.SELECT_SECRET_KEYRING" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>

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

@ -67,8 +67,8 @@ import java.util.Vector;
public class EditKeyActivity extends SherlockFragmentActivity {
// possible intent actions for this activity
public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY";
public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEY";
public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEYRING";
public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEYRING";
// possible extra keys
public static final String EXTRA_USER_IDS = "userIds";

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
View File

@ -33,7 +33,7 @@ public class SelectPublicKeyActivity extends SherlockFragmentActivity {
// Not used in sourcode, but listed in AndroidManifest!
public static final String ACTION_SELECT_PUBLIC_KEYS = Constants.INTENT_PREFIX
+ "SELECT_PUBLIC_KEYS";
+ "SELECT_PUBLIC_KEYRINGS";
public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "masterKeyIds";

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
View File

@ -32,7 +32,7 @@ public class SelectSecretKeyActivity extends SherlockFragmentActivity {
// Not used in sourcode, but listed in AndroidManifest!
public static final String ACTION_SELECT_SECRET_KEY = Constants.INTENT_PREFIX
+ "SELECT_SECRET_KEY";
+ "SELECT_SECRET_KEYRING";
public static final String RESULT_EXTRA_MASTER_KEY_ID = "masterKeyId";
public static final String RESULT_EXTRA_USER_ID = "userId";

8
README.md
View File

@ -84,9 +84,9 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al
* SHARE_KEYRING
* SHARE_KEYRING_WITH_QR_CODE
* SHARE_KEYRING_WITH_NFC
* EDIT_KEY
* SELECT_PUBLIC_KEYS
* SELECT_SECRET_KEY
* EDIT_KEYRING
* SELECT_PUBLIC_KEYRINGS
* SELECT_SECRET_KEYRING
* ENCRYPT
* ENCRYPT_FILE
* DECRYPT
@ -94,7 +94,7 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al
### With permission ACCESS_API
* CREATE_KEY
* CREATE_KEYRING
* ENCRYPT_AND_RETURN
* ENCRYPT_STREAM_AND_RETURN
* GENERATE_SIGNATURE_AND_RETURN