Skip to content

Commit

Permalink
🐛 Fixed productId typo
Browse files Browse the repository at this point in the history
Remove some useless comments also
  • Loading branch information
mapaiva committed Oct 20, 2016
1 parent 8742a54 commit 16da90f
Showing 1 changed file with 1 addition and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void getDeviceListAsync(Promise p) {
public void openDeviceAsync(ReadableMap deviceObject, Promise p) {

try {
int prodId = deviceObject.getInt("productID");
int prodId = deviceObject.getInt("productId");
UsbManager manager = getUsbManager();
UsbSerialDriver driver = getUsbSerialDriver(prodId, manager);

Expand All @@ -77,15 +77,6 @@ public void openDeviceAsync(ReadableMap deviceObject, Promise p) {

p.resolve(usd);
} else {
/* StringBuilder errMessage = new StringBuilder();
String deviceName = deviceObject.getString("deviceName");
int prodId = deviceObject.getInt("productId");
errMessage.append("You don't have permission to open the device %s with the %s productId. ");
errMessage.append("Try to execute the method requestUsbPermissionAsync(deviceObject) first");
throw new Error(String.format(errMessage.toString(), deviceName, prodId)); */

requestUsbPermission(manager, driver.getDevice(), p);
}

Expand All @@ -106,27 +97,6 @@ private UsbSerialDevice createUsbSerialDevice(UsbManager manager, UsbSerialDrive
return new UsbSerialDevice(port);
}

/*private void requestUsbPermissionAsync(ReadableMap deviceObject, Promise p) {
try {
UsbManager manager = getUsbManager();
UsbDevice device = getUsbSerialDriver(deviceObject, manager).getDevice();
if (manager.hasPermission(device)) {
p.resolve(true);
} else {
ReactApplicationContext rAppContext = getReactApplicationContext();
PendingIntent permIntent = PendingIntent.getBroadcast(rAppContext, 0, new Intent(ACTION_USB_PERMISSION), 0);
registerBroadcastReceiver(p);
manager.requestPermission(device, permIntent);
}
} catch (Exception e) {
p.reject(e);
}
}*/

private void requestUsbPermission(UsbManager manager, UsbDevice device, Promise p) {

try {
Expand Down

0 comments on commit 16da90f

Please sign in to comment.