aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-04-15 10:02:41 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-04-15 10:02:41 +0200
commit3668c8897d88989780da800ecd648c7b33a0e8f4 (patch)
treec8c795f52a0f75db54eee515cf29421beb6921fc /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
parentf41758261ffa51274267110d5b0d4dc1de44837e (diff)
downloadopen-keychain-3668c8897d88989780da800ecd648c7b33a0e8f4.tar.gz
open-keychain-3668c8897d88989780da800ecd648c7b33a0e8f4.tar.bz2
open-keychain-3668c8897d88989780da800ecd648c7b33a0e8f4.zip
Fix YubiKey naming, cleanup
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java8
1 files changed, 3 insertions, 5 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 25cc13fcb..aa66053fa 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
@@ -6,9 +6,7 @@
package org.sufficientlysecure.keychain.ui;
-import android.annotation.TargetApi;
import android.content.Intent;
-import android.os.Build;
import android.os.Bundle;
import android.view.WindowManager;
@@ -56,7 +54,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
mServiceIntent = data.getParcelable(EXTRA_SERVICE_INTENT);
// obtain passphrase for this subkey
- obtainYubikeyPin(RequiredInputParcel.createRequiredPassphrase(mRequiredInput));
+ obtainYubiKeyPin(RequiredInputParcel.createRequiredPassphrase(mRequiredInput));
}
@Override
@@ -106,7 +104,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
// avoid a loop
Preferences prefs = Preferences.getPreferences(this);
- if (prefs.useDefaultYubikeyPin()) {
+ if (prefs.useDefaultYubiKeyPin()) {
toast(getString(R.string.error_pin_nodefault));
setResult(RESULT_CANCELED);
finish();
@@ -117,7 +115,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
PassphraseCacheService.clearCachedPassphrase(
this, mRequiredInput.getMasterKeyId(), mRequiredInput.getSubKeyId());
- obtainYubikeyPin(RequiredInputParcel.createRequiredPassphrase(mRequiredInput));
+ obtainYubiKeyPin(RequiredInputParcel.createRequiredPassphrase(mRequiredInput));
}
}