diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-08 15:14:35 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-08 15:14:35 +0200 |
commit | 2d438fbc277f0c5dbe706db70a9e2120a1ea62bc (patch) | |
tree | 413250915ee2fd9e0475cf58c19f393b9d3dac82 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results | |
parent | adcc07ca653db0c8a392a8dd7d75d254bd4cdbc1 (diff) | |
download | open-keychain-2d438fbc277f0c5dbe706db70a9e2120a1ea62bc.tar.gz open-keychain-2d438fbc277f0c5dbe706db70a9e2120a1ea62bc.tar.bz2 open-keychain-2d438fbc277f0c5dbe706db70a9e2120a1ea62bc.zip |
automatically extend single compound entry logs
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java index d65a84e5b..e3f2c1cc5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java @@ -93,6 +93,11 @@ public abstract class OperationResult implements Parcelable { } public OperationLog getLog() { + // If there is only a single entry, and it's a compound one, return that log + if (mLog.isSingleCompound()) { + return ((SubLogEntryParcel) mLog.getFirst()).getSubResult().getLog(); + } + // Otherwse, return our regular log return mLog; } @@ -644,6 +649,10 @@ public abstract class OperationResult implements Parcelable { mParcels.add(new SubLogEntryParcel(subResult, subLog.getFirst().mType, indent, subLog.getFirst().mParameters)); } + boolean isSingleCompound() { + return mParcels.size() == 1 && getFirst() instanceof SubLogEntryParcel; + } + public void clear() { mParcels.clear(); } |