diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-31 19:27:15 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-31 19:27:26 +0200 |
| commit | d48e980946c390e81c6838a68647549605cee922 (patch) | |
| tree | b418edde3d0ee4bdd7cb2b058a08b583112aa8c5 /OpenKeychain | |
| parent | acb5a70e445351f245ef3ffa19e69315f8548ec7 (diff) | |
| download | open-keychain-d48e980946c390e81c6838a68647549605cee922.tar.gz open-keychain-d48e980946c390e81c6838a68647549605cee922.tar.bz2 open-keychain-d48e980946c390e81c6838a68647549605cee922.zip | |
avoid nullpointerexception in EditKeyResult
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java index d5761b030..11829e7b8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java @@ -168,13 +168,13 @@ public abstract class OperationResults { public static class EditKeyResult extends OperationResultParcel { private transient UncachedKeyRing mRing; - public final long mRingMasterKeyId; + public final Long mRingMasterKeyId; public EditKeyResult(int result, OperationLog log, UncachedKeyRing ring) { super(result, log); mRing = ring; - mRingMasterKeyId = ring.getMasterKeyId(); + mRingMasterKeyId = ring != null ? ring.getMasterKeyId() : null; } public UncachedKeyRing getRing() { |