From c05dc5ad56222fff5595ffff8ee4d66a7d539e92 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 20 May 2017 21:54:41 +0200 Subject: [PATCH] fix display of linked identity card --- .../keychain/ui/ViewKeyFragment.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java index f3662c1e7..88b30b29c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java @@ -72,6 +72,8 @@ import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter; import org.sufficientlysecure.keychain.ui.widget.KeyHealthCardView; import org.sufficientlysecure.keychain.util.ContactHelper; import org.sufficientlysecure.keychain.util.Log; +import org.sufficientlysecure.keychain.util.Preferences; + public class ViewKeyFragment extends LoaderFragment implements LoaderManager.LoaderCallbacks { @@ -249,6 +251,7 @@ public class ViewKeyFragment extends LoaderFragment implements // initialize loaders, which will take care of auto-refresh on change getLoaderManager().initLoader(LOADER_ID_USER_IDS, null, this); initLinkedContactLoader(); + initLinkedIds(mIsSecret); initCardButtonsVisibility(mIsSecret); mKeyHealthPresenter = new KeyHealthPresenter( @@ -460,6 +463,16 @@ public class ViewKeyFragment extends LoaderFragment implements } } + private void initLinkedIds(boolean isSecret) { + if (!Preferences.getPreferences(getActivity()).getExperimentalEnableLinkedIdentities()) { + return; + } + + mLinkedIdsAdapter = new LinkedIdsAdapter(getActivity(), null, 0, isSecret, mLinkedIdsExpander); + mLinkedIds.setAdapter(mLinkedIdsAdapter); + getLoaderManager().initLoader(LOADER_ID_LINKED_IDS, null, this); + } + private void initLinkedContactLoader() { if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_DENIED) {