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

OTG: rescan devices before next operation

Browse Source
This commit is contained in:
Nikita Mikhailov
2016-04-10 23:44:52 +06:00
parent 8cb94c446b
commit 4e543e5368
3 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java
View File

@@ -24,7 +24,6 @@ package org.sufficientlysecure.keychain.ui.base;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbManager;
import android.nfc.NfcAdapter;
import android.nfc.Tag;
@@ -144,13 +143,12 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
smartcardDiscovered(new NfcTransport(tag));
}
public void usbDeviceDiscovered(final UsbDevice device) {
public void usbDeviceDiscovered(final UsbTransport transport) {
// Actual USB operations are executed in doInBackground to not block the UI thread
if (!mTagHandlingEnabled)
return;
UsbManager usbManager = (UsbManager) getSystemService(USB_SERVICE);
smartcardDiscovered(new UsbTransport(device, usbManager));
smartcardDiscovered(transport);
}
public void smartcardDiscovered(final Transport transport) {
@@ -481,8 +479,6 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
* persistent connections
*/
protected void checkDeviceConnection() {
if (mSmartcardDevice.isConnected() && mSmartcardDevice.isPersistentConnectionAllowed()) {
this.smartcardDiscovered(mSmartcardDevice.getTransport());
}
mUsbDispatcher.rescanDevices();
}
}