From 65c3d69d9a2e25ae408b4b2eeecb5d1254e56d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 21 Sep 2014 22:31:28 +0200
Subject: Fix ConsolidateResult, needed parcelable methods

---
 .../keychain/service/results/ConsolidateResult.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')

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<ConsolidateResult> CREATOR = new Creator<ConsolidateResult>() {
+        public ConsolidateResult createFromParcel(final Parcel source) {
+            return new ConsolidateResult(source);
+        }
+
+        public ConsolidateResult[] newArray(final int size) {
+            return new ConsolidateResult[size];
+        }
+    };
+
 }
-- 
cgit v1.2.3