diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-22 11:38:45 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-22 11:38:45 +0200 |
commit | e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4 (patch) | |
tree | 14cd6c8085c6ac797f19a89874046d2ee264f0d7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java | |
parent | 4469b84e2c2e87947354b1566f7fc5aa808d0f39 (diff) | |
parent | 90324fc10efd015259c6f95c405dd91504c6c129 (diff) | |
download | open-keychain-e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4.tar.gz open-keychain-e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4.tar.bz2 open-keychain-e76a8aaedfa001447cef3cceb3d0bcdc0aa55fc4.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java index 0ff88d97c..9160d57de 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java @@ -28,10 +28,10 @@ import org.sufficientlysecure.keychain.R; public class SelectSecretKeyActivity extends ActionBarActivity { public static final String EXTRA_FILTER_CERTIFY = "filter_certify"; + public static final String EXTRA_FILTER_SIGN = "filter_sign"; public static final String RESULT_EXTRA_MASTER_KEY_ID = "master_key_id"; - private boolean mFilterCertify; private SelectSecretKeyFragment mSelectFragment; @Override @@ -45,7 +45,8 @@ public class SelectSecretKeyActivity extends ActionBarActivity { actionBar.setDisplayHomeAsUpEnabled(false); actionBar.setHomeButtonEnabled(false); - mFilterCertify = getIntent().getBooleanExtra(EXTRA_FILTER_CERTIFY, false); + boolean filterCertify = getIntent().getBooleanExtra(EXTRA_FILTER_CERTIFY, false); + boolean filterSign = getIntent().getBooleanExtra(EXTRA_FILTER_SIGN, false); // Check that the activity is using the layout version with // the fragment_container FrameLayout @@ -59,7 +60,7 @@ public class SelectSecretKeyActivity extends ActionBarActivity { } // Create an instance of the fragment - mSelectFragment = SelectSecretKeyFragment.newInstance(mFilterCertify); + mSelectFragment = SelectSecretKeyFragment.newInstance(filterCertify, filterSign); // Add the fragment to the 'fragment_container' FrameLayout getSupportFragmentManager().beginTransaction() |