diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-08 22:12:23 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-08 22:12:23 +0100 |
| commit | d515b267964fd5398da8338414acbaebe8edcb21 (patch) | |
| tree | 4626bb22d22758df25b268e1dea21e3facba33b9 /APG-API-Lib/src | |
| parent | 049dc908f8cc00b153e80a975c28325e8b4174ba (diff) | |
| download | open-keychain-d515b267964fd5398da8338414acbaebe8edcb21.tar.gz open-keychain-d515b267964fd5398da8338414acbaebe8edcb21.tar.bz2 open-keychain-d515b267964fd5398da8338414acbaebe8edcb21.zip | |
Generic share of keyring via Android Intent SEND, renaming of own share intents
Diffstat (limited to 'APG-API-Lib/src')
| -rw-r--r-- | APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java index 1362412fb..d6cdc60ab 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java +++ b/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java @@ -81,8 +81,11 @@ public class ApgIntentHelper { /** * Share actions */ - public static final String ACTION_SHARE_WITH_QR_CODE = APG_INTENT_PREFIX + "SHARE_WITH_QR_CODE"; - public static final String ACTION_SHARE_WITH_NFC = APG_INTENT_PREFIX + "SHARE_WITH_NFC"; + public static final String ACTION_SHARE_KEYRING = APG_INTENT_PREFIX + "SHARE_KEYRING"; + public static final String ACTION_SHARE_KEYRING_WITH_QR_CODE = APG_INTENT_PREFIX + + "SHARE_KEYRING_WITH_QR_CODE"; + public static final String ACTION_SHARE_KEYRING_WITH_NFC = APG_INTENT_PREFIX + + "SHARE_KEYRING_WITH_NFC"; // used by SHARE_WITH_QR_CODE and SHARE_WITH_NFC public static final String EXTRA_MASTER_KEY_ID = "masterKeyId"; @@ -168,7 +171,7 @@ public class ApgIntentHelper { * @return true when activity was found and executed successfully */ public boolean shareWithQrCode(long masterKeyId) { - Intent intent = new Intent(ACTION_SHARE_WITH_QR_CODE); + Intent intent = new Intent(ACTION_SHARE_KEYRING_WITH_QR_CODE); intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION); intent.putExtra(EXTRA_MASTER_KEY_ID, masterKeyId); try { @@ -186,7 +189,7 @@ public class ApgIntentHelper { * @return true when activity was found and executed successfully */ public boolean shareWithNfc(long masterKeyId) { - Intent intent = new Intent(ACTION_SHARE_WITH_NFC); + Intent intent = new Intent(ACTION_SHARE_KEYRING_WITH_NFC); intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION); intent.putExtra(EXTRA_MASTER_KEY_ID, masterKeyId); try { |