aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-09-09 21:11:16 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2013-09-09 21:11:16 +0200
commit1421046c6d9a7f153e28b17fbd94e873a1d6aa05 (patch)
tree9eaabdec957a95e7710a2de2c1754dc56c835f63 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain
parent75672fa5b3785d62ee56c738cafd408a2dc272ab (diff)
downloadopen-keychain-1421046c6d9a7f153e28b17fbd94e873a1d6aa05.tar.gz
open-keychain-1421046c6d9a7f153e28b17fbd94e873a1d6aa05.tar.bz2
open-keychain-1421046c6d9a7f153e28b17fbd94e873a1d6aa05.zip
update gradle, description,...
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
index 3360388b8..a8e101dae 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java
@@ -51,10 +51,11 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
public static final String EXTRA_MESSENGER = "messenger";
+ // passphrase action
public static final String EXTRA_SECRET_KEY_ID = "secret_key_id";
+ // register action
public static final String EXTRA_PACKAGE_NAME = "package_name";
-
- // select activity
+ // select pub keys action
public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "master_key_ids";
public static final String EXTRA_MISSING_USER_IDS = "missing_user_ids";
public static final String EXTRA_DUBLICATE_USER_IDS = "dublicate_user_ids";
@@ -63,10 +64,11 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
// register view
private AppSettingsFragment mSettingsFragment;
- // select pub key view
+ // select pub keys view
private SelectPublicKeyFragment mSelectFragment;
- // has the user clicked one of the buttons?
+ // has the user clicked one of the buttons
+ // or do we need to handle the callback in onStop()
private boolean finishHandled;
@Override
@@ -267,7 +269,6 @@ public class CryptoServiceActivity extends SherlockFragmentActivity {
getSupportFragmentManager().beginTransaction()
.add(R.id.api_select_pub_keys_fragment_container, mSelectFragment).commit();
}
-
} else {
Log.e(Constants.TAG, "Wrong action!");
finish();