Clearup after lockpattern experiments

2 files changed, 26 insertions, 31 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
index cd236dd57..6ccadac2e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
@@ -36,18 +36,14 @@ import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
 import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
-import org.spongycastle.openpgp.operator.jcajce.NfcSyncPublicKeyDataDecryptorFactoryBuilder;
 import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
+import org.spongycastle.openpgp.operator.jcajce.NfcSyncPublicKeyDataDecryptorFactoryBuilder;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
-import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralMsgIdException;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SignatureException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -99,7 +95,6 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey {
                     return GNU_DUMMY;
                 case 2:
                     return PASSPHRASE;
-//                return PATTERN;
                 case 3:
                     return PASSPHRASE_EMPTY;
                 case 4:
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 2c4834e02..0f4bfefd4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -382,32 +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);
+//        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) {