1 files changed, 31 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index 39c11a855..fcb6c027d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -12,12 +12,13 @@ import com.github.johnpersano.supertoasts.util.OnClickWrapper;
 import com.github.johnpersano.supertoasts.util.Style;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
 import org.sufficientlysecure.keychain.ui.LogDisplayActivity;
 import org.sufficientlysecure.keychain.ui.LogDisplayFragment;
 
 public abstract class OperationResults {
 
-    public static class ImportResult extends OperationResultParcel {
+    public static class ImportKeyResult extends OperationResultParcel {
 
         public final int mNewKeys, mUpdatedKeys, mBadKeys;
 
@@ -47,15 +48,15 @@ public abstract class OperationResults {
             return (mResult & RESULT_FAIL_NOTHING) == RESULT_FAIL_NOTHING;
         }
 
-        public ImportResult(Parcel source) {
+        public ImportKeyResult(Parcel source) {
             super(source);
             mNewKeys = source.readInt();
             mUpdatedKeys = source.readInt();
             mBadKeys = source.readInt();
         }
 
-        public ImportResult(int result, OperationLog log,
-                            int newKeys, int updatedKeys, int badKeys) {
+        public ImportKeyResult(int result, OperationLog log,
+                               int newKeys, int updatedKeys, int badKeys) {
             super(result, log);
             mNewKeys = newKeys;
             mUpdatedKeys = updatedKeys;
@@ -70,13 +71,13 @@ public abstract class OperationResults {
             dest.writeInt(mBadKeys);
         }
 
-        public static Creator<ImportResult> CREATOR = new Creator<ImportResult>() {
-            public ImportResult createFromParcel(final Parcel source) {
-                return new ImportResult(source);
+        public static Creator<ImportKeyResult> CREATOR = new Creator<ImportKeyResult>() {
+            public ImportKeyResult createFromParcel(final Parcel source) {
+                return new ImportKeyResult(source);
             }
 
-            public ImportResult[] newArray(final int size) {
-                return new ImportResult[size];
+            public ImportKeyResult[] newArray(final int size) {
+                return new ImportKeyResult[size];
             }
         };
 
@@ -92,7 +93,7 @@ public abstract class OperationResults {
                 String withWarnings;
 
                 // Any warnings?
-                if ((resultType & ImportResult.RESULT_WITH_WARNINGS) > 0) {
+                if ((resultType & ImportKeyResult.RESULT_WITH_WARNINGS) > 0) {
                     duration = 0;
                     color = Style.ORANGE;
                     withWarnings = activity.getResources().getString(R.string.import_with_warnings);
@@ -151,7 +152,7 @@ public abstract class OperationResults {
                             public void onClick(View view, Parcelable token) {
                                 Intent intent = new Intent(
                                         activity, LogDisplayActivity.class);
-                                intent.putExtra(LogDisplayFragment.EXTRA_RESULT, ImportResult.this);
+                                intent.putExtra(LogDisplayFragment.EXTRA_RESULT, ImportKeyResult.this);
                                 activity.startActivity(intent);
                             }
                         }
@@ -164,6 +165,25 @@ public abstract class OperationResults {
 
     }
 
+    public static class EditKeyResult extends OperationResultParcel {
+
+        public EditKeyResult(Parcel source) {
+            super(source);
+        }
+
+        public static Creator<EditKeyResult> CREATOR = new Creator<EditKeyResult>() {
+            public EditKeyResult createFromParcel(final Parcel source) {
+                return new EditKeyResult(source);
+            }
+
+            public EditKeyResult[] newArray(final int size) {
+                return new EditKeyResult[size];
+            }
+        };
+
+    }
+
+
     public static class SaveKeyringResult extends OperationResultParcel {
 
         public SaveKeyringResult(int result, OperationLog log) {