cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix display of linked identity card

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-20 21:54:41 +02:00
parent 02a23a1dd8
commit c05dc5ad56
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
View File

@@ -72,6 +72,8 @@ import org.sufficientlysecure.keychain.ui.widget.KeyHealthPresenter;
import org.sufficientlysecure.keychain.ui.widget.KeyHealthCardView; import org.sufficientlysecure.keychain.ui.widget.KeyHealthCardView;
import org.sufficientlysecure.keychain.util.ContactHelper; import org.sufficientlysecure.keychain.util.ContactHelper;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences;
public class ViewKeyFragment extends LoaderFragment implements public class ViewKeyFragment extends LoaderFragment implements
LoaderManager.LoaderCallbacks<Cursor> { LoaderManager.LoaderCallbacks<Cursor> {
@@ -249,6 +251,7 @@ public class ViewKeyFragment extends LoaderFragment implements
// initialize loaders, which will take care of auto-refresh on change // initialize loaders, which will take care of auto-refresh on change
getLoaderManager().initLoader(LOADER_ID_USER_IDS, null, this); getLoaderManager().initLoader(LOADER_ID_USER_IDS, null, this);
initLinkedContactLoader(); initLinkedContactLoader();
initLinkedIds(mIsSecret);
initCardButtonsVisibility(mIsSecret); initCardButtonsVisibility(mIsSecret);
mKeyHealthPresenter = new KeyHealthPresenter( 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() { private void initLinkedContactLoader() {
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_CONTACTS) if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_CONTACTS)
== PackageManager.PERMISSION_DENIED) { == PackageManager.PERMISSION_DENIED) {