aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-24 19:47:54 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-24 19:47:54 +0100
commit3edf47c5decdc547724bc84628ddfa25bf8ae53a (patch)
treea6101db5aeae1947e6a9cef99c6055c67bb7c053 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked
parente573cd774a4a41234c229d9c49ef7a5656445f93 (diff)
downloadopen-keychain-3edf47c5decdc547724bc84628ddfa25bf8ae53a.tar.gz
open-keychain-3edf47c5decdc547724bc84628ddfa25bf8ae53a.tar.bz2
open-keychain-3edf47c5decdc547724bc84628ddfa25bf8ae53a.zip
secret/public distinction in LinkedIdView
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
index 4a3c6f4d0..e0db0174e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
@@ -315,13 +315,13 @@ public class LinkedIdViewFragment extends Fragment implements
}
}
- void showVerifyingContainer(boolean show) {
+ void showVerifyingContainer(boolean show, boolean isSecret) {
if (vVerifyingContainer.getDisplayedChild() == (show ? 1 : 0)) {
return;
}
vVerifyingContainer.setDisplayedChild(show ? 1 : 0);
- vItemCertified.setDisplayedChild(show ? 1 : 0);
+ vItemCertified.setDisplayedChild(show && !isSecret ? 1 : 0);
}
void showButton(int which) {
@@ -363,7 +363,7 @@ public class LinkedIdViewFragment extends Fragment implements
mViewHolder.showButton(0);
mViewHolder.vKeySpinner.setVisibility(View.GONE);
- mViewHolder.showVerifyingContainer(false);
+ mViewHolder.showVerifyingContainer(false, mIsSecret);
return;
}
@@ -376,7 +376,7 @@ public class LinkedIdViewFragment extends Fragment implements
manager.beginTransaction().addToBackStack("verification").commit();
manager.executePendingTransactions();
manager.addOnBackStackChangedListener(this);
- mViewHolder.showVerifyingContainer(true);
+ mViewHolder.showVerifyingContainer(true, mIsSecret);
}
@@ -474,7 +474,7 @@ public class LinkedIdViewFragment extends Fragment implements
return;
}
if (result.success()) {
- mViewHolder.vText.setText(mLinkedResource.getVerifiedText());
+ mViewHolder.vText.setText(mLinkedResource.getVerifiedText(mIsSecret));
mViewHolder.setVerifyingState(VerifyState.VERIFY_OK, mIsSecret);
} else {
mViewHolder.setVerifyingState(VerifyState.VERIFY_ERROR, mIsSecret);