Merge branch 'development' of github.com:open-keychain/open-keychain into development

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();
         }