diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-16 13:40:37 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-16 13:40:37 +0200 |
commit | a83f260cdbe28a0f5ad1094b3c3ebd8044834aa9 (patch) | |
tree | a0cb7390255f7d46590c94e6c94e54d10d3313d3 /OpenKeychain/src/main/java | |
parent | 995003af60204e0520c55d6e3113842a02c07095 (diff) | |
download | open-keychain-a83f260cdbe28a0f5ad1094b3c3ebd8044834aa9.tar.gz open-keychain-a83f260cdbe28a0f5ad1094b3c3ebd8044834aa9.tar.bz2 open-keychain-a83f260cdbe28a0f5ad1094b3c3ebd8044834aa9.zip |
Clear cache when PIN is too short
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java | 3 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java index af20ddc84..c167e2b57 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java @@ -305,7 +305,8 @@ public class NfcOperationActivity extends BaseNfcActivity { } @Override - public void onPinError() { + public void onNfcPinError(String error) { + onNfcError(error); // avoid a loop Preferences prefs = Preferences.getPreferences(this); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java index 44db22ff2..f29f6eb7c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java @@ -35,7 +35,6 @@ import android.nfc.TagLostException; import android.nfc.tech.IsoDep; import android.os.AsyncTask; import android.os.Bundle; -import android.widget.Toast; import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.util.Arrays; @@ -137,11 +136,8 @@ public abstract class BaseNfcActivity extends BaseActivity { /** * Override to do something when PIN is wrong, e.g., clear passphrases (UI thread) */ - protected void onPinError() { - // use Toast because activity is finished afterwards - Toast.makeText(this, R.string.error_pin_wrong, Toast.LENGTH_LONG).show(); - setResult(RESULT_CANCELED); - finish(); + protected void onNfcPinError(String error) { + onNfcError(error); } public void handleIntentInBackground(final Intent intent) { @@ -246,11 +242,9 @@ public abstract class BaseNfcActivity extends BaseActivity { // Wrong PIN, a status of 63CX indicates X attempts remaining. if ((status & (short) 0xFFF0) == 0x63C0) { - // hook to do something different when PIN is wrong - onPinError(); - int tries = status & 0x000F; - onNfcError(getResources().getQuantityString(R.plurals.error_pin, tries, tries)); + // hook to do something different when PIN is wrong + onNfcPinError(getResources().getQuantityString(R.plurals.error_pin, tries, tries)); return; } @@ -284,7 +278,7 @@ public abstract class BaseNfcActivity extends BaseActivity { break; } case 0x6700: { - onNfcError(getString(R.string.error_nfc_wrong_length)); + onNfcPinError(getString(R.string.error_nfc_wrong_length)); break; } case 0x6982: { |