diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java index 44177563f..c8a469545 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java @@ -18,10 +18,29 @@ package org.sufficientlysecure.keychain.service.results; +import android.os.Parcel; + public class ConsolidateResult extends OperationResult { public ConsolidateResult(int result, OperationLog log) { super(result, log); } + /** + * Construct from a parcel - trivial because we have no extra data. + */ + public ConsolidateResult(Parcel source) { + super(source); + } + + public static Creator CREATOR = new Creator() { + public ConsolidateResult createFromParcel(final Parcel source) { + return new ConsolidateResult(source); + } + + public ConsolidateResult[] newArray(final int size) { + return new ConsolidateResult[size]; + } + }; + } diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml index 1dc45a9a8..954467aa3 100644 --- a/OpenKeychain/src/main/res/layout/log_display_activity.xml +++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml @@ -1,7 +1,7 @@ -