avoid nullpointerexception in EditKeyResult
This commit is contained in:
parent
acb5a70e44
commit
d48e980946
|
@ -168,13 +168,13 @@ public abstract class OperationResults {
|
||||||
public static class EditKeyResult extends OperationResultParcel {
|
public static class EditKeyResult extends OperationResultParcel {
|
||||||
|
|
||||||
private transient UncachedKeyRing mRing;
|
private transient UncachedKeyRing mRing;
|
||||||
public final long mRingMasterKeyId;
|
public final Long mRingMasterKeyId;
|
||||||
|
|
||||||
public EditKeyResult(int result, OperationLog log,
|
public EditKeyResult(int result, OperationLog log,
|
||||||
UncachedKeyRing ring) {
|
UncachedKeyRing ring) {
|
||||||
super(result, log);
|
super(result, log);
|
||||||
mRing = ring;
|
mRing = ring;
|
||||||
mRingMasterKeyId = ring.getMasterKeyId();
|
mRingMasterKeyId = ring != null ? ring.getMasterKeyId() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public UncachedKeyRing getRing() {
|
public UncachedKeyRing getRing() {
|
||||||
|
|
Loading…
Reference in a new issue