moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Clearup after lockpattern experiments

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-06 19:29:51 +01:00
parent af762a65a0
commit 6ec85b0550
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
View File

@ -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:

50
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
View File

@ -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) {