Refactoring: Removed PassphraseChangeParcel and placed its functionality into ChangeUnlockParcel.

1 files changed, 11 insertions, 2 deletions

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;
     }