moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-11 11:35:07 -05:00
Code Issues Releases Wiki Activity

Fixes, update Integration lib

Browse Source
This commit is contained in:
Dominik Schürmann 2013-01-08 20:42:22 +01:00
parent 55530597df
commit 049dc908f8
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
View File

@ -66,9 +66,26 @@ public class ApgIntentHelper {
public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEY"; public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEY";
/** /**
* Scan QR code, without permission * Import actions
*/ */
public static final String ACTION_SCAN_QR_CODE = APG_INTENT_PREFIX + "SCAN_QR_CODE"; public static final String ACTION_IMPORT = APG_INTENT_PREFIX + "IMPORT";
// only used by IMPORT
public static final String EXTRA_IMPORT_TEXT = "text";
public static final String EXTRA_IMPORT_KEYRING_BYTES = "keyringBytes";
public static final String ACTION_IMPORT_FROM_FILE = APG_INTENT_PREFIX + "IMPORT_FROM_FILE";
public static final String ACTION_IMPORT_FROM_QR_CODE = APG_INTENT_PREFIX
+ "IMPORT_FROM_QR_CODE";
/**
* 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";
// used by SHARE_WITH_QR_CODE and SHARE_WITH_NFC
public static final String EXTRA_MASTER_KEY_ID = "masterKeyId";
public static final String EXTRA_TEXT = "text"; public static final String EXTRA_TEXT = "text";
public static final String EXTRA_DATA = "data"; public static final String EXTRA_DATA = "data";
@ -133,8 +150,8 @@ public class ApgIntentHelper {
* *
* @return true when activity was found and executed successfully * @return true when activity was found and executed successfully
*/ */
public boolean scanQrCode() { public boolean importFromQrCode() {
Intent intent = new Intent(ACTION_SCAN_QR_CODE); Intent intent = new Intent(ACTION_IMPORT_FROM_QR_CODE);
intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION); intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
try { try {
startActivityForResult(intent, -1); startActivityForResult(intent, -1);
@ -145,6 +162,42 @@ public class ApgIntentHelper {
} }
} }
/**
* Opens activity with qr code for masterKeyId
*
* @return true when activity was found and executed successfully
*/
public boolean shareWithQrCode(long masterKeyId) {
Intent intent = new Intent(ACTION_SHARE_WITH_QR_CODE);
intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
intent.putExtra(EXTRA_MASTER_KEY_ID, masterKeyId);
try {
startActivityForResult(intent, -1);
return true;
} catch (ActivityNotFoundException e) {
activityNotFound();
return false;
}
}
/**
* Opens activity to share keyring withnc based on given masterKeyId
*
* @return true when activity was found and executed successfully
*/
public boolean shareWithNfc(long masterKeyId) {
Intent intent = new Intent(ACTION_SHARE_WITH_NFC);
intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
intent.putExtra(EXTRA_MASTER_KEY_ID, masterKeyId);
try {
startActivityForResult(intent, -1);
return true;
} catch (ActivityNotFoundException e) {
activityNotFound();
return false;
}
}
/** /**
* Opens APG activity to create new key * Opens APG activity to create new key
* *

2
APG/src/org/thialfihar/android/apg/ui/ImportKeysActivity.java
View File

@ -59,7 +59,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
// only used by IMPORT // only used by IMPORT
public static final String EXTRA_TEXT = "text"; public static final String EXTRA_TEXT = "text";
public static final String EXTRA_KEYRING_BYTES = "keyring_bytes"; public static final String EXTRA_KEYRING_BYTES = "keyringBytes";
// public static final String EXTRA_KEY_ID = "keyId"; // public static final String EXTRA_KEY_ID = "keyId";