Skip to content

Minor crash fixes #132

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor crash fixes #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b275f49
Fix incorrect null guard
peitschie Oct 8, 2021
cdc8535
Return an error instead of crashing if openSerial called before permi…
peitschie Oct 8, 2021
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
77 changes: 41 additions & 36 deletions src/android/fr/drangies/cordova/serial/Serial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,45 +224,50 @@ else if (driver.equals("Ch34xSerialDriver")) {
private void openSerial(final JSONObject opts, final CallbackContext callbackContext) {
cordova.getThreadPool().execute(new Runnable() {
public void run() {
UsbDeviceConnection connection = manager.openDevice(driver.getDevice());
if (connection != null) {
// get first port and open it
port = driver.getPorts().get(0);
try {
// get connection params or the default values
baudRate = opts.has("baudRate") ? opts.getInt("baudRate") : 9600;
dataBits = opts.has("dataBits") ? opts.getInt("dataBits") : UsbSerialPort.DATABITS_8;
stopBits = opts.has("stopBits") ? opts.getInt("stopBits") : UsbSerialPort.STOPBITS_1;
parity = opts.has("parity") ? opts.getInt("parity") : UsbSerialPort.PARITY_NONE;
setDTR = opts.has("dtr") && opts.getBoolean("dtr");
setRTS = opts.has("rts") && opts.getBoolean("rts");
// Sleep On Pause defaults to true
sleepOnPause = opts.has("sleepOnPause") ? opts.getBoolean("sleepOnPause") : true;
if (driver == null) {
callbackContext.error("Request permissions before attempting opening port");
}
else {
UsbDeviceConnection connection = manager.openDevice(driver.getDevice());
if (connection != null) {
// get first port and open it
port = driver.getPorts().get(0);
try {
// get connection params or the default values
baudRate = opts.has("baudRate") ? opts.getInt("baudRate") : 9600;
dataBits = opts.has("dataBits") ? opts.getInt("dataBits") : UsbSerialPort.DATABITS_8;
stopBits = opts.has("stopBits") ? opts.getInt("stopBits") : UsbSerialPort.STOPBITS_1;
parity = opts.has("parity") ? opts.getInt("parity") : UsbSerialPort.PARITY_NONE;
setDTR = opts.has("dtr") && opts.getBoolean("dtr");
setRTS = opts.has("rts") && opts.getBoolean("rts");
// Sleep On Pause defaults to true
sleepOnPause = opts.has("sleepOnPause") ? opts.getBoolean("sleepOnPause") : true;

port.open(connection);
port.setParameters(baudRate, dataBits, stopBits, parity);
if (setDTR) port.setDTR(true);
if (setRTS) port.setRTS(true);
}
catch (IOException e) {
// deal with error
Log.d(TAG, e.getMessage());
callbackContext.error(e.getMessage());
}
catch (JSONException e) {
// deal with error
Log.d(TAG, e.getMessage());
callbackContext.error(e.getMessage());
}

port.open(connection);
port.setParameters(baudRate, dataBits, stopBits, parity);
if (setDTR) port.setDTR(true);
if (setRTS) port.setRTS(true);
Log.d(TAG, "Serial port opened!");
callbackContext.success("Serial port opened!");
}
catch (IOException e) {
// deal with error
Log.d(TAG, e.getMessage());
callbackContext.error(e.getMessage());
}
catch (JSONException e) {
// deal with error
Log.d(TAG, e.getMessage());
callbackContext.error(e.getMessage());
else {
Log.d(TAG, "Cannot connect to the device!");
callbackContext.error("Cannot connect to the device!");
}

Log.d(TAG, "Serial port opened!");
callbackContext.success("Serial port opened!");
onDeviceStateChange();
}
else {
Log.d(TAG, "Cannot connect to the device!");
callbackContext.error("Cannot connect to the device!");
}
onDeviceStateChange();
}
});
}
Expand Down Expand Up @@ -423,7 +428,7 @@ private void stopIoManager() {
* Observe serial connection
*/
private void startIoManager() {
if (driver != null) {
if (port != null) {
Log.i(TAG, "Starting io manager.");
mSerialIoManager = new SerialInputOutputManager(port, mListener);
mExecutor.submit(mSerialIoManager);
Expand Down