Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel.

4 files changed, 52 insertions, 71 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java
index 2bfe8254c..fa8fd0841 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ChangeUnlockParcel.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 package org.sufficientlysecure.keychain.service;
 
 import android.os.Parcel;
@@ -7,22 +26,36 @@ import org.sufficientlysecure.keychain.util.Passphrase;
 
 public class ChangeUnlockParcel implements Parcelable {
 
+    // the master key id of keyring.
+    public Long mMasterKeyId;
+    // the key fingerprint, for safety.
+    public byte[] mFingerprint;
     // The new passphrase to use
     public final Passphrase mNewPassphrase;
 
-    public ChangeUnlockParcel(Passphrase newPassphrase) {
+    public ChangeUnlockParcel(Long masterKeyId, byte[] fingerprint, Passphrase newPassphrase) {
         if (newPassphrase == null) {
             throw new AssertionError("newPassphrase must be non-null. THIS IS A BUG!");
         }
+
+        mMasterKeyId = masterKeyId;
+        mFingerprint = fingerprint;
         mNewPassphrase = newPassphrase;
     }
 
     public ChangeUnlockParcel(Parcel source) {
+        mMasterKeyId = source.readInt() != 0 ? source.readLong() : null;
+        mFingerprint = source.createByteArray();
         mNewPassphrase = source.readParcelable(Passphrase.class.getClassLoader());
     }
 
     @Override
     public void writeToParcel(Parcel destination, int flags) {
+        destination.writeInt(mMasterKeyId == null ? 0 : 1);
+        if (mMasterKeyId != null) {
+            destination.writeLong(mMasterKeyId);
+        }
+        destination.writeByteArray(mFingerprint);
         destination.writeParcelable(mNewPassphrase, flags);
     }
 
@@ -42,7 +75,10 @@ public class ChangeUnlockParcel implements Parcelable {
     };
 
     public String toString() {
-        return "passphrase (" + mNewPassphrase + ")";
+        String out = "mMasterKeyId: " + mMasterKeyId + "\n";
+        out += "passphrase (" + mNewPassphrase + ")";
+
+        return out;
     }
 
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
index e337703d9..c287f6b38 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
@@ -38,7 +38,7 @@ import org.sufficientlysecure.keychain.operations.BackupOperation;
 import org.sufficientlysecure.keychain.operations.ImportOperation;
 import org.sufficientlysecure.keychain.operations.KeybaseVerificationOperation;
 import org.sufficientlysecure.keychain.operations.InputDataOperation;
-import org.sufficientlysecure.keychain.operations.PassphraseChangeOperation;
+import org.sufficientlysecure.keychain.operations.ChangeUnlockOperation;
 import org.sufficientlysecure.keychain.operations.PromoteKeyOperation;
 import org.sufficientlysecure.keychain.operations.RevokeOperation;
 import org.sufficientlysecure.keychain.operations.SignEncryptOperation;
@@ -117,8 +117,8 @@ public class KeychainService extends Service implements Progressable {
                     op = new PgpDecryptVerifyOperation(outerThis, new ProviderHelper(outerThis), outerThis);
                 } else if (inputParcel instanceof SaveKeyringParcel) {
                     op = new EditKeyOperation(outerThis, new ProviderHelper(outerThis), outerThis, mActionCanceled);
-                } else if (inputParcel instanceof  PassphraseChangeParcel) {
-                    op = new PassphraseChangeOperation(outerThis, new ProviderHelper(outerThis), outerThis);
+                } else if (inputParcel instanceof  ChangeUnlockParcel) {
+                    op = new ChangeUnlockOperation(outerThis, new ProviderHelper(outerThis), outerThis);
                 } else if (inputParcel instanceof RevokeKeyringParcel) {
                     op = new RevokeOperation(outerThis, new ProviderHelper(outerThis), outerThis);
                 } else if (inputParcel instanceof CertifyActionsParcel) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseChangeParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseChangeParcel.java
deleted file mode 100644
index 8b08aa115..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseChangeParcel.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.sufficientlysecure.keychain.service;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class PassphraseChangeParcel implements Parcelable {
-
-    // the master key id to be edited.
-    public Long mMasterKeyId;
-    // the first sub key id that is not stripped.
-    public Long mValidSubkeyId;
-    // the key fingerprint, for safety.
-    public byte[] mFingerprint;
-
-    public ChangeUnlockParcel mNewUnlock;
-
-
-    public PassphraseChangeParcel(long masterKeyId, byte[] fingerprint) {
-        mMasterKeyId = masterKeyId;
-        mFingerprint = fingerprint;
-    }
-
-    public PassphraseChangeParcel(Parcel source) {
-        mValidSubkeyId = source.readInt() != 0 ? source.readLong() : null;
-        mMasterKeyId = source.readLong();
-        mFingerprint = source.createByteArray();
-
-        mNewUnlock = source.readParcelable(getClass().getClassLoader());
-    }
-
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel destination, int flags) {
-        destination.writeInt(mValidSubkeyId == null ? 0 : 1);
-        if (mValidSubkeyId != null) {
-            destination.writeLong(mValidSubkeyId);
-        }
-        destination.writeLong(mMasterKeyId);
-        destination.writeByteArray(mFingerprint);
-        destination.writeParcelable(mNewUnlock, flags);
-    }
-
-    public static final Creator<PassphraseChangeParcel> CREATOR = new Creator<PassphraseChangeParcel>() {
-        public PassphraseChangeParcel createFromParcel(final Parcel source) {
-            return new PassphraseChangeParcel(source);
-        }
-
-        public PassphraseChangeParcel[] newArray(final int size) {
-            return new PassphraseChangeParcel[size];
-        }
-    };
-
-    public String toString() {
-        String out = "mMasterKeyId: " + mMasterKeyId + "\n";
-        out += "mNewUnlock: " + mNewUnlock + "\n";
-
-        return out;
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index 563a67b3f..32ec48343 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -49,8 +49,6 @@ public class SaveKeyringParcel implements Parcelable {
     // the key fingerprint, for safety. MUST be null for a new key.
     public byte[] mFingerprint;
 
-    public ChangeUnlockParcel mNewUnlock;
-
     public ArrayList<String> mAddUserIds;
     public ArrayList<WrappedUserAttribute> mAddUserAttribute;
     public ArrayList<SubkeyAdd> mAddSubKeys;
@@ -70,6 +68,9 @@ public class SaveKeyringParcel implements Parcelable {
     private boolean mUploadAtomic;
     private String mKeyserver;
 
+    // private because we have to set other details like key id
+    private ChangeUnlockParcel mNewUnlock;
+
     public SaveKeyringParcel() {
         reset();
     }
@@ -102,6 +103,14 @@ public class SaveKeyringParcel implements Parcelable {
         mKeyserver = keysever;
     }
 
+    public void setNewUnlock(Passphrase passphrase) {
+        mNewUnlock = new ChangeUnlockParcel(mMasterKeyId, mFingerprint, passphrase);
+    }
+
+    public ChangeUnlockParcel getChangeUnlockParcel() {
+        return mNewUnlock;
+    }
+
     public boolean isUpload() {
         return mUpload;
     }