PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

avoid nullpointerexception in EditKeyResult

Browse source
This commit is contained in:
Vincent Breitmoser 2014-07-31 19:27:15 +02:00
parent acb5a70e44
commit d48e980946
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
View file

@ -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() {