aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-15 03:45:43 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-17 18:52:59 +0200
commitb8305d43dcae87b441e48eb8f47e471e0b0c2781 (patch)
tree0a51077cc1ef703e8c53aaf9b64eedda10aaac80
parentb7834b432697af8026ae403b5841fedde1697a6f (diff)
downloadopen-keychain-b8305d43dcae87b441e48eb8f47e471e0b0c2781.tar.gz
open-keychain-b8305d43dcae87b441e48eb8f47e471e0b0c2781.tar.bz2
open-keychain-b8305d43dcae87b441e48eb8f47e471e0b0c2781.zip
return actual last log entry, including from sublogentryparcels
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
index 707cf0af1..8c68bda19 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
@@ -854,7 +854,11 @@ public abstract class OperationResult implements Parcelable {
if (mParcels.isEmpty()) {
return null;
}
- return mParcels.get(mParcels.size() -1);
+ LogEntryParcel last = mParcels.get(mParcels.size() -1);
+ if (last instanceof SubLogEntryParcel) {
+ return ((SubLogEntryParcel) last).getSubResult().getLog().getLast();
+ }
+ return last;
}
@Override