cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct pin for nfc in EncryptActivity

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-09-24 15:04:23 +02:00
parent c7b0f77c9b
commit e0da0f6eb5
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@@ -207,7 +207,7 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv
SignEncryptResult.RESULT_PENDING_NFC) {
mNfcTimestamp = pgpResult.getNfcTimestamp();
startNfcSign("123456", pgpResult.getNfcHash(), pgpResult.getNfcAlgo());
startNfcSign(pgpResult.getNfcPassphrase(), pgpResult.getNfcHash(), pgpResult.getNfcAlgo());
} else {
throw new RuntimeException("Unhandled pending result!");
}

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java
View File

@@ -43,6 +43,7 @@ public class NfcActivity extends ActionBarActivity {
// always
public static final String EXTRA_PIN = "pin";
public static final String EXTRA_FINGERPRINT = "fingerprint";
// special extra for OpenPgpService
public static final String EXTRA_DATA = "data";
@@ -63,6 +64,8 @@ public class NfcActivity extends ActionBarActivity {
private String mPin;
private byte[] mFingerprint;
// sign
private byte[] mHashToSign;
private int mHashAlgo;
@@ -83,6 +86,9 @@ public class NfcActivity extends ActionBarActivity {
Bundle data = intent.getExtras();
String action = intent.getAction();
// TODO check fingerprint
// mFingerprint = data.getByteArray(EXTRA_FINGERPRINT);
if (ACTION_SIGN_HASH.equals(action)) {
mAction = action;
mPin = data.getString(EXTRA_PIN);