Skip to content

Fixed(UsbAPI): Implement product/vendor ID support #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexytomi wants to merge 1 commit into from
Closed

Fixed(UsbAPI): Implement product/vendor ID support #824

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 55 additions & 33 deletions app/src/main/java/com/termux/api/apis/UsbAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.concurrent.atomic.AtomicReference;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

public class UsbAPI {

Expand Down Expand Up @@ -111,9 +112,8 @@ public void onDestroy() {
}



protected void runListAction(Intent intent) {
Logger.logVerbose(LOG_TAG,"Running 'list' usb devices action");
Logger.logVerbose(LOG_TAG, "Running 'list' usb devices action");

ResultReturner.returnData(this, intent, new ResultReturner.ResultJsonWriter() {
@Override
Expand All @@ -134,60 +134,64 @@ protected void listDevices(JsonWriter out) throws IOException {
}



protected void runPermissionAction(Intent intent) {
mThreadPoolExecutor.submit(() -> {
String deviceName = intent.getStringExtra("device");
String vendorId = intent.getStringExtra("vendorId");
String productId = intent.getStringExtra("productId");
String device = (deviceName != null) ? deviceName : vendorId + ":" + productId;

Logger.logVerbose(LOG_TAG,"Running 'permission' action for device \"" + deviceName + "\"");
Logger.logVerbose(LOG_TAG, "Running 'permission' action for device \"" + device + "\"");

UsbDevice device = getDevice(intent, deviceName);
if (device == null) return;
UsbDevice usbDevice = getDevice(intent, deviceName, vendorId, productId);
if (usbDevice == null) return;

int status = checkAndRequestUsbDevicePermission(intent, device);
int status = checkAndRequestUsbDevicePermission(intent, usbDevice);
ResultReturner.returnData(this, intent, out -> {
if (status == 0) {
Logger.logVerbose(LOG_TAG, "Permission granted for device \"" + device.getDeviceName() + "\"");
out.append("Permission granted.\n" );
Logger.logVerbose(LOG_TAG, "Permission granted for device \"" + usbDevice.getDeviceName() + "\"");
out.append("Permission granted.\n");
} else if (status == 1) {
Logger.logVerbose(LOG_TAG, "Permission denied for device \"" + device.getDeviceName() + "\"");
out.append("Permission denied.\n" );
Logger.logVerbose(LOG_TAG, "Permission denied for device \"" + usbDevice.getDeviceName() + "\"");
out.append("Permission denied.\n");
} else if (status == -1) {
out.append("Permission request timeout.\n" );
out.append("Permission request timeout.\n");
}
});
});
}



protected void runOpenAction(Intent intent) {
mThreadPoolExecutor.submit(() -> {
String deviceName = intent.getStringExtra("device");
String vendorId = intent.getStringExtra("vendorId");
String productId = intent.getStringExtra("productId");
String device = (deviceName != null) ? deviceName : vendorId + ":" + productId;

Logger.logVerbose(LOG_TAG,"Running 'open' action for device \"" + deviceName + "\"");
Logger.logVerbose(LOG_TAG, "Running 'open' action for device \"" + device + "\"");

UsbDevice device = getDevice(intent, deviceName);
if (device == null) return;
UsbDevice usbDevice = getDevice(intent, deviceName, vendorId, productId);
if (usbDevice == null) return;

int status = checkAndRequestUsbDevicePermission(intent, device);
int status = checkAndRequestUsbDevicePermission(intent, usbDevice);
ResultReturner.returnData(this, intent, new ResultReturner.WithAncillaryFd() {
@Override
public void writeResult(PrintWriter out) {
if (status == 0) {
int fd = open(device);
int fd = open(usbDevice);
if (fd < 0) {
Logger.logVerbose(LOG_TAG, "Failed to open device \"" + device.getDeviceName() + "\": " + fd);
Logger.logVerbose(LOG_TAG, "Failed to open device \"" + usbDevice.getDeviceName() + "\": " + fd);
out.append("Open device failed.\n");
} else {
Logger.logVerbose(LOG_TAG, "Open device \"" + device.getDeviceName() + "\" successful");
Logger.logVerbose(LOG_TAG, "Open device \"" + usbDevice.getDeviceName() + "\" successful");
this.sendFd(out, fd);
}
} else if (status == 1) {
Logger.logVerbose(LOG_TAG, "Permission denied to open device \"" + device.getDeviceName() + "\"");
out.append("Permission denied.\n" );
Logger.logVerbose(LOG_TAG, "Permission denied to open device \"" + usbDevice.getDeviceName() + "\"");
out.append("Permission denied.\n");
} else if (status == -1) {
out.append("Permission request timeout.\n" );
out.append("Permission request timeout.\n");
}
}
});
Expand All @@ -211,20 +215,38 @@ protected int open(@NonNull UsbDevice device) {
}



protected UsbDevice getDevice(Intent intent, String deviceName) {
protected UsbDevice getDevice(Intent intent, @Nullable String deviceName, @Nullable String vendorId, @Nullable String productId) {
UsbManager usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);

HashMap<String, UsbDevice> deviceList = usbManager.getDeviceList();
UsbDevice device = deviceList.get(deviceName);
if (device == null) {
Logger.logVerbose(LOG_TAG, "Failed to find device \"" + deviceName + "\"");
ResultReturner.returnData(this, intent, out -> out.append("No such device.\n"));
if (deviceName != null) {
HashMap<String, UsbDevice> deviceList = usbManager.getDeviceList();
UsbDevice usbDevice = deviceList.get(deviceName);
if (usbDevice != null) return usbDevice;
}

return device;
}
if (vendorId != null && productId != null) {
// If we do not strip the 0x, it freezes at Integer.parseInt
vendorId = vendorId.startsWith("0x") ? vendorId.substring(2) : vendorId;
productId = productId.startsWith("0x") ? productId.substring(2) : productId;
// UsbDevice returns int, not hex, correct for that.
int iVendorId = Integer.parseInt(vendorId, 16);
int iProductId = Integer.parseInt(productId, 16);
for (UsbDevice usbDevice : usbManager.getDeviceList().values()) {
if (usbDevice.getVendorId() == iVendorId && usbDevice.getProductId() == iProductId) {
if (deviceName != null && !(deviceName.equals(usbDevice.getDeviceName()))) {
Logger.logVerbose(LOG_TAG, "Device \"" + deviceName + "\" mismatch with " + vendorId + ":" + productId);
ResultReturner.returnData(this, intent, out -> out.append("No such device.\n"));
return null;
}
return usbDevice;
}
}
}

Logger.logVerbose(LOG_TAG, "No intent extras were passed for device name or vendor and product id.");
ResultReturner.returnData(this, intent, out -> out.append("No such device.\n"));
return null;
}


protected boolean checkUsbDevicePermission(@NonNull UsbDevice device) {
Expand All @@ -239,7 +261,7 @@ protected int checkAndRequestUsbDevicePermission(Intent intent, @NonNull UsbDevi
return 0;
}

if(!intent.getBooleanExtra("request", false)) {
if (!intent.getBooleanExtra("request", false)) {
return 1;
}

Expand Down