ImportKeys: Get reference to canonicalized key without saving and refactoring (WIP)

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ImportKeyringParcel.java

@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.service;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 
 import java.util.ArrayList;
@@ -28,12 +29,18 @@ public class ImportKeyringParcel implements Parcelable {
     // if null, keys are expected to be read from a cache file in ImportExportOperations
     public ArrayList<ParcelableKeyRing> mKeyList;
     public String mKeyserver; // must be set if keys are to be imported from a keyserver
+    public boolean mSkipSave = false; // don't save the key, only return it as part of result
 
-    public ImportKeyringParcel (ArrayList<ParcelableKeyRing> keyList, String keyserver) {
+    public ImportKeyringParcel(ArrayList<ParcelableKeyRing> keyList, String keyserver) {
         mKeyList = keyList;
         mKeyserver = keyserver;
     }
 
+    public ImportKeyringParcel(ArrayList<ParcelableKeyRing> keyList, String keyserver, boolean skipSave) {
+        this(keyList, keyserver);
+        mSkipSave = skipSave;
+    }
+
     protected ImportKeyringParcel(Parcel in) {
         if (in.readByte() == 0x01) {
             mKeyList = new ArrayList<>();
@@ -42,6 +49,7 @@ public class ImportKeyringParcel implements Parcelable {
             mKeyList = null;
         }
         mKeyserver = in.readString();
+        mSkipSave = in.readInt() != 0;
     }
 
     @Override
@@ -58,6 +66,7 @@ public class ImportKeyringParcel implements Parcelable {
             dest.writeList(mKeyList);
         }
         dest.writeString(mKeyserver);
+        dest.writeInt(mSkipSave ? 1 : 0);
     }
 
     public static final Parcelable.Creator<ImportKeyringParcel> CREATOR = new Parcelable.Creator<ImportKeyringParcel>() {