diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-29 23:12:11 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-29 23:12:11 +0100 |
commit | 576e6fd0cca41691a52db8e1325508f00a6e9bc6 (patch) | |
tree | 98382f7c4ca1103577c736960859983b3d694460 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java | |
parent | bf4762ef6f33543657f0eace12164bc0c5093054 (diff) | |
download | open-keychain-576e6fd0cca41691a52db8e1325508f00a6e9bc6.tar.gz open-keychain-576e6fd0cca41691a52db8e1325508f00a6e9bc6.tar.bz2 open-keychain-576e6fd0cca41691a52db8e1325508f00a6e9bc6.zip |
introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java index bcc98a5d7..b48f10bbf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java @@ -34,6 +34,7 @@ import android.widget.TextView; import org.spongycastle.bcpg.sig.KeyFlags; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract; @@ -165,7 +166,9 @@ public class CreateKeyFinalFragment extends Fragment { String userId = KeyRing.createUserId(mName, mEmail, null); mSaveKeyringParcel.mAddUserIds.add(userId); mSaveKeyringParcel.mChangePrimaryUserId = userId; - mSaveKeyringParcel.mNewPassphrase = mPassphrase; + mSaveKeyringParcel.mNewUnlock = mPassphrase != null + ? new ChangeUnlockParcel(mPassphrase, null) + : null; } } |