upload: re-add upload by bytes

1 files changed, 19 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java
index 724792b70..0a14f3dc6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/UploadKeyringParcel.java
@@ -26,16 +26,26 @@ import android.os.Parcelable;
 
 public class UploadKeyringParcel implements Parcelable {
     public String mKeyserver;
-    public long mMasterKeyId;
+
+    public final Long mMasterKeyId;
+    public final byte[] mUncachedKeyringBytes;
 
     public UploadKeyringParcel(String keyserver, long masterKeyId) {
         mKeyserver = keyserver;
         mMasterKeyId = masterKeyId;
+        mUncachedKeyringBytes = null;
+    }
+
+    public UploadKeyringParcel(String keyserver, byte[] uncachedKeyringBytes) {
+        mKeyserver = keyserver;
+        mMasterKeyId = null;
+        mUncachedKeyringBytes = uncachedKeyringBytes;
     }
 
     protected UploadKeyringParcel(Parcel in) {
         mKeyserver = in.readString();
-        mMasterKeyId = in.readLong();
+        mMasterKeyId = in.readInt() != 0 ? in.readLong() : null;
+        mUncachedKeyringBytes = in.createByteArray();
     }
 
     @Override
@@ -46,7 +56,13 @@ public class UploadKeyringParcel implements Parcelable {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(mKeyserver);
-        dest.writeValue(mMasterKeyId);
+        if (mMasterKeyId != null) {
+            dest.writeInt(1);
+            dest.writeLong(mMasterKeyId);
+        } else {
+            dest.writeInt(0);
+        }
+        dest.writeByteArray(mUncachedKeyringBytes);
     }
 
     public static final Creator<UploadKeyringParcel> CREATOR = new Creator<UploadKeyringParcel>() {