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

force reinserting keys on manual key update

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-14 13:18:08 +02:00
parent e3e5f7feec
commit 634694b20e
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ImportKeyringParcel.java
View File

@@ -35,31 +35,37 @@ public abstract class ImportKeyringParcel implements Parcelable {
@Nullable // must be set if keys are to be imported from a keyserver
public abstract HkpKeyserverAddress getKeyserver();
public abstract boolean isSkipSave();
public abstract boolean isForceReinsert();
public static ImportKeyringParcel createImportKeyringParcel(List<ParcelableKeyRing> keyList,
HkpKeyserverAddress keyserver) {
return new AutoValue_ImportKeyringParcel(keyList, keyserver, false);
return new AutoValue_ImportKeyringParcel(keyList, keyserver, false, false);
}
public static ImportKeyringParcel createImportKeyringParcel(List<ParcelableKeyRing> keyList,
HkpKeyserverAddress keyserver, boolean forceReinsert) {
return new AutoValue_ImportKeyringParcel(keyList, keyserver, false, forceReinsert);
}
public static ImportKeyringParcel createWithSkipSave(List<ParcelableKeyRing> keyList,
HkpKeyserverAddress keyserver) {
return new AutoValue_ImportKeyringParcel(keyList, keyserver, true);
return new AutoValue_ImportKeyringParcel(keyList, keyserver, true, false);
}
public static ImportKeyringParcel createImportKeyringParcel(ParcelableKeyRing key) {
return new AutoValue_ImportKeyringParcel(Collections.singletonList(key), null, false);
return new AutoValue_ImportKeyringParcel(Collections.singletonList(key), null, false, false);
}
public static ImportKeyringParcel createFromBytes(byte[] keyData) {
ParcelableKeyRing keyRing = ParcelableKeyRing.createFromEncodedBytes(keyData);
return new AutoValue_ImportKeyringParcel(Collections.singletonList(keyRing), null, false);
return new AutoValue_ImportKeyringParcel(Collections.singletonList(keyRing), null, false, false);
}
public static ImportKeyringParcel createFromFileCacheWithSkipSave() {
return new AutoValue_ImportKeyringParcel(null, null, true);
return new AutoValue_ImportKeyringParcel(null, null, true, false);
}
public static ImportKeyringParcel createFromFileCache() {
return new AutoValue_ImportKeyringParcel(null, null, false);
return new AutoValue_ImportKeyringParcel(null, null, false, false);
}
}