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

update "last seen" when uploading to keyserver

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-04 22:20:30 +02:00
parent 5b4f6cebf7
commit 37040f8586
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
View File

@@ -171,7 +171,7 @@ public class EditKeyOperation extends BaseReadWriteOperation<SaveKeyringParcel>
SaveKeyringResult saveResult = mKeyWritableRepository.saveSecretKeyRing(ring); SaveKeyringResult saveResult = mKeyWritableRepository.saveSecretKeyRing(ring);
log.add(saveResult, 1); log.add(saveResult, 1);
if (isNewKey) { if (isNewKey || saveParcel.isShouldUpload()) {
keyMetadataDao.renewKeyLastUpdatedTime(ring.getMasterKeyId(), saveParcel.isShouldUpload()); keyMetadataDao.renewKeyLastUpdatedTime(ring.getMasterKeyId(), saveParcel.isShouldUpload());
} }

15
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
View File

@@ -29,6 +29,9 @@ import android.support.v4.os.CancellationSignal;
import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.daos.KeyMetadataDao;
import org.sufficientlysecure.keychain.daos.KeyRepository;
import org.sufficientlysecure.keychain.daos.KeyWritableRepository;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress; import org.sufficientlysecure.keychain.keyimport.HkpKeyserverAddress;
import org.sufficientlysecure.keychain.keyimport.HkpKeyserverClient; import org.sufficientlysecure.keychain.keyimport.HkpKeyserverClient;
import org.sufficientlysecure.keychain.keyimport.KeyserverClient.AddKeyException; import org.sufficientlysecure.keychain.keyimport.KeyserverClient.AddKeyException;
@@ -41,8 +44,6 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing;
import org.sufficientlysecure.keychain.pgp.Progressable; import org.sufficientlysecure.keychain.pgp.Progressable;
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
import org.sufficientlysecure.keychain.daos.KeyRepository;
import org.sufficientlysecure.keychain.daos.KeyWritableRepository;
import org.sufficientlysecure.keychain.service.UploadKeyringParcel; import org.sufficientlysecure.keychain.service.UploadKeyringParcel;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel; import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
@@ -56,10 +57,13 @@ import timber.log.Timber;
* An operation class which implements the upload of a single key to a key server. * An operation class which implements the upload of a single key to a key server.
*/ */
public class UploadOperation extends BaseOperation<UploadKeyringParcel> { public class UploadOperation extends BaseOperation<UploadKeyringParcel> {
private KeyMetadataDao keyMetadataDao;
public UploadOperation(Context context, KeyRepository keyRepository, public UploadOperation(Context context, KeyRepository keyRepository,
Progressable progressable, CancellationSignal cancelled) { Progressable progressable, CancellationSignal cancelled) {
super(context, keyRepository, progressable, cancelled); super(context, keyRepository, progressable, cancelled);
keyMetadataDao = KeyMetadataDao.create(mContext);
} }
@NonNull @NonNull
@@ -150,11 +154,18 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> {
keyring.encode(aos); keyring.encode(aos);
aos.close(); aos.close();
if (checkCancelled()) {
log.add(LogType.MSG_OPERATION_CANCELLED, 0);
return new UploadResult(UploadResult.RESULT_CANCELLED, log);
}
String armoredKey = bos.toString("UTF-8"); String armoredKey = bos.toString("UTF-8");
keyserverInteractor.add(armoredKey, proxy); keyserverInteractor.add(armoredKey, proxy);
updateProgress(R.string.progress_uploading, 1, 1); updateProgress(R.string.progress_uploading, 1, 1);
keyMetadataDao.renewKeyLastUpdatedTime(keyring.getMasterKeyId(), true);
log.add(LogType.MSG_UPLOAD_SUCCESS, 1); log.add(LogType.MSG_UPLOAD_SUCCESS, 1);
return new UploadResult(UploadResult.RESULT_OK, log); return new UploadResult(UploadResult.RESULT_OK, log);
} catch (IOException e) { } catch (IOException e) {