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

Clean up NfcOperationActivity

Browse Source
This commit is contained in:
Dominik Schürmann 2015-04-15 09:55:29 +02:00
parent 84deba9886
commit f41758261f
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
View File

@ -27,10 +27,9 @@ import java.io.IOException;
/** /**
* This class provides a communication interface to OpenPGP applications on ISO SmartCard compliant * This class provides a communication interface to OpenPGP applications on ISO SmartCard compliant
* NFC devices. * NFC devices.
* * <p/>
* For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf * For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf
*/ */
@TargetApi(Build.VERSION_CODES.GINGERBREAD_MR1)
public class NfcOperationActivity extends BaseNfcActivity { public class NfcOperationActivity extends BaseNfcActivity {
public static final String EXTRA_REQUIRED_INPUT = "required_input"; public static final String EXTRA_REQUIRED_INPUT = "required_input";
@ -71,16 +70,15 @@ public class NfcOperationActivity extends BaseNfcActivity {
CryptoInputParcel inputParcel = new CryptoInputParcel(mRequiredInput.mSignatureTime); CryptoInputParcel inputParcel = new CryptoInputParcel(mRequiredInput.mSignatureTime);
switch (mRequiredInput.mType) { switch (mRequiredInput.mType) {
case NFC_DECRYPT: {
case NFC_DECRYPT:
for (int i = 0; i < mRequiredInput.mInputHashes.length; i++) { for (int i = 0; i < mRequiredInput.mInputHashes.length; i++) {
byte[] hash = mRequiredInput.mInputHashes[i]; byte[] hash = mRequiredInput.mInputHashes[i];
byte[] decryptedSessionKey = nfcDecryptSessionKey(hash); byte[] decryptedSessionKey = nfcDecryptSessionKey(hash);
inputParcel.addCryptoData(hash, decryptedSessionKey); inputParcel.addCryptoData(hash, decryptedSessionKey);
} }
break; break;
}
case NFC_SIGN: case NFC_SIGN: {
for (int i = 0; i < mRequiredInput.mInputHashes.length; i++) { for (int i = 0; i < mRequiredInput.mInputHashes.length; i++) {
byte[] hash = mRequiredInput.mInputHashes[i]; byte[] hash = mRequiredInput.mInputHashes[i];
int algo = mRequiredInput.mSignAlgos[i]; int algo = mRequiredInput.mSignAlgos[i];
@ -89,6 +87,7 @@ public class NfcOperationActivity extends BaseNfcActivity {
} }
break; break;
} }
}
if (mServiceIntent != null) { if (mServiceIntent != null) {
CryptoInputParcelCacheService.addCryptoInputParcel(this, mServiceIntent, inputParcel); CryptoInputParcelCacheService.addCryptoInputParcel(this, mServiceIntent, inputParcel);
@ -100,7 +99,6 @@ public class NfcOperationActivity extends BaseNfcActivity {
} }
finish(); finish();
} }
@Override @Override
@ -120,6 +118,6 @@ public class NfcOperationActivity extends BaseNfcActivity {
this, mRequiredInput.getMasterKeyId(), mRequiredInput.getSubKeyId()); this, mRequiredInput.getMasterKeyId(), mRequiredInput.getSubKeyId());
obtainYubikeyPin(RequiredInputParcel.createRequiredPassphrase(mRequiredInput)); obtainYubikeyPin(RequiredInputParcel.createRequiredPassphrase(mRequiredInput));
} }
} }