From 840d57bf3b2c91f63f0df9d8988c16eb467b4a29 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 13 Nov 2015 16:56:35 +0100 Subject: passphraseactivity: add inline spinner to password dialog --- .../keychain/operations/EditKeyOperation.java | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java index 51485a35d..8af2fdc67 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java @@ -171,27 +171,6 @@ public class EditKeyOperation extends BaseOperation { return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null); } - // There is a new passphrase - cache it - if (saveParcel.mNewUnlock != null && cryptoInput.mCachePassphrase) { - log.add(LogType.MSG_ED_CACHING_NEW, 1); - - // NOTE: Don't cache empty passphrases! Important for MOVE_KEY_TO_CARD - if (saveParcel.mNewUnlock.mNewPassphrase != null - && ( ! saveParcel.mNewUnlock.mNewPassphrase.isEmpty())) { - PassphraseCacheService.addCachedPassphrase(mContext, - ring.getMasterKeyId(), - ring.getMasterKeyId(), - saveParcel.mNewUnlock.mNewPassphrase, - ring.getPublicKey().getPrimaryUserIdWithFallback()); - } else if (saveParcel.mNewUnlock.mNewPin != null) { - PassphraseCacheService.addCachedPassphrase(mContext, - ring.getMasterKeyId(), - ring.getMasterKeyId(), - saveParcel.mNewUnlock.mNewPin, - ring.getPublicKey().getPrimaryUserIdWithFallback()); - } - } - updateProgress(R.string.progress_done, 100, 100); // make sure new data is synced into contacts -- cgit v1.2.3