From e34ad18ed26166751f6897169056044c2d19ce67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 6 Jan 2015 14:52:07 +0100 Subject: Passphrase wizard tests --- .../keychain/ui/EditKeyFragment.java | 47 ++++++++++++---------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index 7acd62c72..2c4834e02 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -382,29 +382,32 @@ public class EditKeyFragment extends LoaderFragment implements } private void changePassphrase() { + Intent passIntent = new Intent(getActivity(), PassphraseWizardActivity.class); + passIntent.setAction(PassphraseWizardActivity.CREATE_METHOD); + startActivityForResult(passIntent, 12); // Message is received after passphrase is cached - Handler returnHandler = new Handler() { - @Override - public void handleMessage(Message message) { - if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) { - Bundle data = message.getData(); - - // cache new returned passphrase! - mSaveKeyringParcel.mNewUnlock = new ChangeUnlockParcel( - data.getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE), - null - ); - } - } - }; - - // Create a new Messenger for the communication back - Messenger messenger = new Messenger(returnHandler); - - SetPassphraseDialogFragment setPassphraseDialog = SetPassphraseDialogFragment.newInstance( - messenger, mCurrentPassphrase, R.string.title_change_passphrase); - - setPassphraseDialog.show(getActivity().getSupportFragmentManager(), "setPassphraseDialog"); +// Handler returnHandler = new Handler() { +// @Override +// public void handleMessage(Message message) { +// if (message.what == SetPassphraseDialogFragment.MESSAGE_OKAY) { +// Bundle data = message.getData(); +// +// // cache new returned passphrase! +// mSaveKeyringParcel.mNewUnlock = new ChangeUnlockParcel( +// data.getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE), +// null +// ); +// } +// } +// }; +// +// // Create a new Messenger for the communication back +// Messenger messenger = new Messenger(returnHandler); +// +// SetPassphraseDialogFragment setPassphraseDialog = SetPassphraseDialogFragment.newInstance( +// messenger, mCurrentPassphrase, R.string.title_change_passphrase); +// +// setPassphraseDialog.show(getActivity().getSupportFragmentManager(), "setPassphraseDialog"); } private void editUserId(final int position) { -- cgit v1.2.3