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

move loading of certs into CertificationDao

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-06-19 15:11:04 +02:00
parent f3ef530b96
commit 6585e7113d
8 changed files with 120 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/LinkedIdViewFragment.java
View File

@@ -21,6 +21,7 @@ package org.sufficientlysecure.keychain.ui.keyview;
import java.io.IOException;
import java.util.Collections;
import android.arch.lifecycle.LiveData;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
@@ -54,6 +55,9 @@ import org.sufficientlysecure.keychain.linked.LinkedAttribute;
import org.sufficientlysecure.keychain.linked.LinkedResource;
import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
import org.sufficientlysecure.keychain.linked.UriAttribute;
import org.sufficientlysecure.keychain.livedata.CertificationDao;
import org.sufficientlysecure.keychain.livedata.GenericLiveData;
import org.sufficientlysecure.keychain.model.Certification.CertDetails;
import org.sufficientlysecure.keychain.operations.results.LinkedVerifyResult;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
@@ -407,17 +411,18 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
viewHolder.vButtonRetry.setOnClickListener(v -> verifyResource());
viewHolder.vButtonConfirm.setOnClickListener(v -> initiateCertifying());
{
Bundle args = new Bundle();
args.putParcelable(CertListWidget.ARG_URI, Certs.buildLinkedIdCertsUri(dataUri, lidRank));
args.putBoolean(CertListWidget.ARG_IS_SECRET, isSecret);
getLoaderManager().initLoader(CertListWidget.LOADER_ID_LINKED_CERTS,
args, viewHolder.vLinkedCerts);
}
CertificationDao certificationDao = CertificationDao.getInstance(getContext());
LiveData<CertDetails> certDetailsLiveData = new GenericLiveData<>(
getContext(), null, () -> certificationDao.getVerifyingCertDetails(masterKeyId, lidRank));
certDetailsLiveData.observe(this, this::onLoadCertDetails);
return root;
}
private void onLoadCertDetails(CertDetails certDetails) {
viewHolder.vLinkedCerts.setData(certDetails, isSecret);
}
void verifyResource() {
// only one at a time (no sync needed, taskInProgress is only touched in ui thread)

76
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertListWidget.java
View File

@@ -33,43 +33,14 @@ import android.widget.TextView;
import android.widget.ViewAnimator;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.model.Certification.CertDetails;
import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
public class CertListWidget extends ViewAnimator
implements LoaderManager.LoaderCallbacks<Cursor> {
public static final int LOADER_ID_LINKED_CERTS = 38572;
public static final String ARG_URI = "uri";
public static final String ARG_IS_SECRET = "is_secret";
// These are the rows that we will retrieve.
static final String[] CERTS_PROJECTION = new String[]{
KeychainContract.Certs._ID,
KeychainContract.Certs.MASTER_KEY_ID,
KeychainContract.Certs.VERIFIED,
KeychainContract.Certs.TYPE,
KeychainContract.Certs.RANK,
KeychainContract.Certs.KEY_ID_CERTIFIER,
KeychainContract.Certs.USER_ID,
KeychainContract.Certs.SIGNER_UID,
KeychainContract.Certs.CREATION
};
public static final int INDEX_MASTER_KEY_ID = 1;
public static final int INDEX_VERIFIED = 2;
public static final int INDEX_TYPE = 3;
public static final int INDEX_RANK = 4;
public static final int INDEX_KEY_ID_CERTIFIER = 5;
public static final int INDEX_USER_ID = 6;
public static final int INDEX_SIGNER_UID = 7;
public static final int INDEX_CREATION = 8;
public class CertListWidget extends ViewAnimator {
private TextView vCollapsed;
private ListView vExpanded;
private View vExpandButton;
private boolean mIsSecret;
public CertListWidget(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -105,41 +76,11 @@ public class CertListWidget extends ViewAnimator
setDisplayedChild(expanded ? 1 : 0);
}
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
Uri uri = args.getParcelable(ARG_URI);
mIsSecret = args.getBoolean(ARG_IS_SECRET, false);
return new CursorLoader(getContext(), uri,
CERTS_PROJECTION, null, null, null);
}
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
if (data == null || !data.moveToFirst()) {
return;
}
// TODO support external certificates
Long certTime = null;
while (!data.isAfterLast()) {
int verified = data.getInt(INDEX_VERIFIED);
long creation = data.getLong(INDEX_CREATION) * 1000;
if (verified == Certs.VERIFIED_SECRET) {
if (certTime == null || certTime > creation) {
certTime = creation;
}
}
data.moveToNext();
}
if (certTime != null) {
public void setData(CertDetails certDetails, boolean isSecret) {
if (certDetails != null) {
CharSequence relativeTimeStr = DateUtils
.getRelativeTimeSpanString(certTime, System.currentTimeMillis(), 0, DateUtils.FORMAT_ABBREV_ALL);
if (mIsSecret) {
.getRelativeTimeSpanString(certDetails.creation(), System.currentTimeMillis(), 0, DateUtils.FORMAT_ABBREV_ALL);
if (isSecret) {
vCollapsed.setText("You created this identity " + relativeTimeStr + ".");
} else {
vCollapsed.setText("You verified and confirmed this identity " + relativeTimeStr + ".");
@@ -150,9 +91,4 @@ public class CertListWidget extends ViewAnimator
}
@Override
public void onLoaderReset(Loader<Cursor> loader) {
setVisibility(View.GONE);
}
}