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

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/smartcard/UsbTransport.java
View File

@@ -130,9 +130,13 @@ public class UsbTransport implements Transport {
*/ */
@Override @Override
public void release() { public void release() {
mConnection.releaseInterface(mUsbInterface); if (mConnection != null) {
mConnection.close(); mConnection.releaseInterface(mUsbInterface);
mConnection = null; mConnection.close();
mConnection = null;
}
Log.d(Constants.TAG, "Usb transport disconnected");
} }
/** /**
@@ -292,4 +296,8 @@ public class UsbTransport implements Transport {
public int hashCode() { public int hashCode() {
return mUsbDevice != null ? mUsbDevice.hashCode() : 0; return mUsbDevice != null ? mUsbDevice.hashCode() : 0;
} }
public UsbDevice getUsbDevice() {
return mUsbDevice;
}
} }

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

53
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/UsbConnectionDispatcher.java
View File

@@ -26,13 +26,15 @@ import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbManager; import android.hardware.usb.UsbManager;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.smartcard.UsbTransport;
import org.sufficientlysecure.keychain.ui.UsbEventReceiverActivity; import org.sufficientlysecure.keychain.ui.UsbEventReceiverActivity;
import org.sufficientlysecure.keychain.util.Log;
public class UsbConnectionDispatcher { public class UsbConnectionDispatcher {
private Activity mActivity; private Activity mActivity;
private OnDiscoveredUsbDeviceListener mListener; private OnDiscoveredUsbDeviceListener mListener;
private UsbTransport mLastUsedUsbTransport;
private UsbManager mUsbManager;
/** /**
* Receives broadcast when a supported USB device get permission. * Receives broadcast when a supported USB device get permission.
*/ */
@@ -41,13 +43,27 @@ public class UsbConnectionDispatcher {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if (UsbEventReceiverActivity.ACTION_USB_PERMISSION.equals(action)) { switch (action) {
UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); case UsbEventReceiverActivity.ACTION_USB_PERMISSION: {
boolean permission = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
false); boolean permission = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED,
if (permission) { false);
Log.d(Constants.TAG, "Got permission for " + usbDevice.getDeviceName()); if (permission) {
mListener.usbDeviceDiscovered(usbDevice); Log.d(Constants.TAG, "Got permission for " + usbDevice.getDeviceName());
mLastUsedUsbTransport = new UsbTransport(usbDevice, mUsbManager);
mListener.usbDeviceDiscovered(mLastUsedUsbTransport);
}
break;
}
case UsbManager.ACTION_USB_DEVICE_DETACHED: {
UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
if (mLastUsedUsbTransport != null && mLastUsedUsbTransport.getUsbDevice().equals(usbDevice)) {
mLastUsedUsbTransport.release();
mLastUsedUsbTransport = null;
}
break;
} }
} }
} }
@@ -56,11 +72,13 @@ public class UsbConnectionDispatcher {
public UsbConnectionDispatcher(final Activity activity, final OnDiscoveredUsbDeviceListener listener) { public UsbConnectionDispatcher(final Activity activity, final OnDiscoveredUsbDeviceListener listener) {
this.mActivity = activity; this.mActivity = activity;
this.mListener = listener; this.mListener = listener;
this.mUsbManager = (UsbManager) activity.getSystemService(Context.USB_SERVICE);
} }
public void onStart() { public void onStart() {
final IntentFilter intentFilter = new IntentFilter(); final IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(UsbEventReceiverActivity.ACTION_USB_PERMISSION); intentFilter.addAction(UsbEventReceiverActivity.ACTION_USB_PERMISSION);
intentFilter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
mActivity.registerReceiver(mUsbReceiver, intentFilter); mActivity.registerReceiver(mUsbReceiver, intentFilter);
} }
@@ -69,7 +87,24 @@ public class UsbConnectionDispatcher {
mActivity.unregisterReceiver(mUsbReceiver); mActivity.unregisterReceiver(mUsbReceiver);
} }
/**
* Rescans devices and triggers {@link OnDiscoveredUsbDeviceListener}
*/
public void rescanDevices() {
// Note: we don't check devices VID/PID because
// we check for permisssion instead.
// We should have permission only for matching devices
for (UsbDevice device : mUsbManager.getDeviceList().values()) {
if (mUsbManager.hasPermission(device)) {
if (mListener != null) {
mListener.usbDeviceDiscovered(new UsbTransport(device, mUsbManager));
}
break;
}
}
}
public interface OnDiscoveredUsbDeviceListener { public interface OnDiscoveredUsbDeviceListener {
void usbDeviceDiscovered(UsbDevice usbDevice); void usbDeviceDiscovered(UsbTransport usbTransport);
} }
} }