aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-29 17:27:04 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-29 17:27:04 +0200
commitbff302f80865a89a46e2c111bb2f3c99986bc285 (patch)
tree299e981dec10595d815e6a2e66494a184d86164c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
parentfeef4a93abd2ebcd7a4dd6868c9a924628863a06 (diff)
downloadopen-keychain-bff302f80865a89a46e2c111bb2f3c99986bc285.tar.gz
open-keychain-bff302f80865a89a46e2c111bb2f3c99986bc285.tar.bz2
open-keychain-bff302f80865a89a46e2c111bb2f3c99986bc285.zip
Show linked identity menu item and linked identities only when feature is enabled
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index fd50ed5ef..2ffb7227e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -389,7 +389,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
exportKey.setVisible(mIsSecret);
MenuItem addLinked = menu.findItem(R.id.menu_key_view_add_linked_identity);
- addLinked.setVisible(mIsSecret);
+ addLinked.setVisible(mIsSecret
+ && Preferences.getPreferences(this).getExperimentalEnableLinkedIdentities());
MenuItem certifyFingerprint = menu.findItem(R.id.menu_key_view_certify_fingerprint);
certifyFingerprint.setVisible(!mIsSecret && !mIsVerified && !mIsExpired && !mIsRevoked);