aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-16 00:40:10 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-16 00:40:10 +0100
commitec2ca61b65b881a9f5d3c572d85d770ba8a31abb (patch)
treea61b032bedfaaf07820744b077e19e90a4693283 /OpenPGP-Keychain/src/main/java
parent81b810e9f6cee2ac549758563fcd8987806828a4 (diff)
downloadopen-keychain-ec2ca61b65b881a9f5d3c572d85d770ba8a31abb.tar.gz
open-keychain-ec2ca61b65b881a9f5d3c572d85d770ba8a31abb.tar.bz2
open-keychain-ec2ca61b65b881a9f5d3c572d85d770ba8a31abb.zip
fix some intents and demos
Diffstat (limited to 'OpenPGP-Keychain/src/main/java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index e0f25b632..1864e0d9d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -57,6 +57,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
+ "IMPORT_KEY_FROM_QR_CODE";
public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = Constants.INTENT_PREFIX
+ "IMPORT_KEY_FROM_KEYSERVER";
+ // TODO: implement:
public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN = Constants.INTENT_PREFIX
+ "IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN";