fix misbehavior in ImportKeyringParcel
This commit is contained in:
parent
7fc805d70c
commit
c4f67f434c
|
@ -45,4 +45,12 @@ public abstract class ImportKeyringParcel implements Parcelable {
|
||||||
ParcelableHkpKeyserver keyserver) {
|
ParcelableHkpKeyserver keyserver) {
|
||||||
return new AutoValue_ImportKeyringParcel(keyList, keyserver, true);
|
return new AutoValue_ImportKeyringParcel(keyList, keyserver, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static ImportKeyringParcel createFromFileCacheWithSkipSave() {
|
||||||
|
return new AutoValue_ImportKeyringParcel(null, null, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ImportKeyringParcel createFromFileCache() {
|
||||||
|
return new AutoValue_ImportKeyringParcel(null, null, false);
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -218,9 +218,6 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
|
||||||
}
|
}
|
||||||
|
|
||||||
private ImportKeyringParcel prepareKeyOperation(ImportKeysListEntry entry, boolean skipSave) {
|
private ImportKeyringParcel prepareKeyOperation(ImportKeysListEntry entry, boolean skipSave) {
|
||||||
ArrayList<ParcelableKeyRing> keysList = null;
|
|
||||||
ParcelableHkpKeyserver keyserver = null;
|
|
||||||
|
|
||||||
ParcelableKeyRing keyRing = entry.getParcelableKeyRing();
|
ParcelableKeyRing keyRing = entry.getParcelableKeyRing();
|
||||||
if (keyRing.getBytes() != null) {
|
if (keyRing.getBytes() != null) {
|
||||||
// instead of giving the entries by Intent extra, cache them into a
|
// instead of giving the entries by Intent extra, cache them into a
|
||||||
|
@ -236,16 +233,23 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
|
||||||
Log.e(Constants.TAG, "Problem writing cache file", e);
|
Log.e(Constants.TAG, "Problem writing cache file", e);
|
||||||
Notify.create(mActivity, "Problem writing cache file!", Notify.Style.ERROR).show();
|
Notify.create(mActivity, "Problem writing cache file!", Notify.Style.ERROR).show();
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
keysList = new ArrayList<>();
|
|
||||||
keysList.add(keyRing);
|
|
||||||
keyserver = entry.getKeyserver();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (skipSave) {
|
if (skipSave) {
|
||||||
return ImportKeyringParcel.createWithSkipSave(keysList, keyserver);
|
return ImportKeyringParcel.createFromFileCacheWithSkipSave();
|
||||||
|
} else {
|
||||||
|
return ImportKeyringParcel.createFromFileCache();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return ImportKeyringParcel.createImportKeyringParcel(keysList, keyserver);
|
ArrayList<ParcelableKeyRing> keysList = new ArrayList<>();
|
||||||
|
keysList.add(keyRing);
|
||||||
|
|
||||||
|
ParcelableHkpKeyserver keyserver = entry.getKeyserver();
|
||||||
|
|
||||||
|
if (skipSave) {
|
||||||
|
return ImportKeyringParcel.createWithSkipSave(keysList, keyserver);
|
||||||
|
} else {
|
||||||
|
return ImportKeyringParcel.createImportKeyringParcel(keysList, keyserver);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue