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

Poll if yubikey has been taken away

Browse Source
This commit is contained in:
Dominik Schürmann
2015-07-06 14:12:33 +02:00
parent 9c0ec1f496
commit 45f85bcfdf
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import org.sufficientlysecure.keychain.service.PassphraseCacheService;
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel; import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity; import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Passphrase; import org.sufficientlysecure.keychain.util.Passphrase;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
@@ -217,13 +216,18 @@ public class NfcOperationActivity extends BaseNfcActivity {
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
// wait some 1000ms here, give the user time to appreciate the displayed finish // check all 200ms if YubiKey has been taken away
try { while (true) {
Thread.sleep(1000); if (isNfcConnected()) {
} catch (InterruptedException e) { try {
// never mind Thread.sleep(200);
} catch (InterruptedException e) {
// never mind
}
} else {
return null;
}
} }
return null;
} }
@Override @Override
protected void onPostExecute(Void result) { protected void onPostExecute(Void result) {

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
View File

@@ -399,9 +399,10 @@ public abstract class BaseNfcActivity extends BaseActivity {
doNfcInBackground(); doNfcInBackground();
mIsoDep.close(); }
mIsoDep = null;
public boolean isNfcConnected() {
return mIsoDep.isConnected();
} }
/** Return the key id from application specific data stored on tag, or null /** Return the key id from application specific data stored on tag, or null