public/cordova-zebra-printer
public/cordova-zebra-printer
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android - improve exception handling

Browse Source
This commit is contained in:
Evan Moore 2019-04-05 11:00:38 -04:00
parent 31cdc1b281
commit 6946a6dec2
1 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/android/com/apache/cordova/plugins/zebra/ZebraPrinter.java
View File

@ -88,8 +88,7 @@ public class ZebraPrinter extends CordovaPlugin {
return; return;
} }
cordova.getThreadPool().execute(() -> { cordova.getThreadPool().execute(() -> {
printer = instance.connect(address); if (instance.connect(address)) {
if (printer != null) {
callbackContext.success(); callbackContext.success();
} else { } else {
callbackContext.error("Connect Failed"); callbackContext.error("Connect Failed");
@ -158,50 +157,71 @@ public class ZebraPrinter extends CordovaPlugin {
return printerConnection != null && printerConnection.isConnected(); return printerConnection != null && printerConnection.isConnected();
} }
private com.zebra.sdk.printer.ZebraPrinter connect(String macAddress) { private boolean connect(String macAddress) {
if (isConnected()) {
disconnect();
}
printerConnection = null;
printerConnection = new BluetoothConnection(macAddress);
synchronized (ZebraPrinter.lock) { synchronized (ZebraPrinter.lock) {
Log.v("EMO", "Printer - Connecting...");
//disconnect if we are already connected
try { try {
printerConnection.open(); if (printerConnection != null && printerConnection.isConnected()) {
}
catch (ConnectionException e) {
Log.v("EMO", "Printer - Failed to open connection", e);
disconnect();
}
printer = null;
if (printerConnection.isConnected()) {
try {
printer = ZebraPrinterFactory.getInstance(printerConnection);
} catch (ConnectionException e) {
Log.v("EMO", "Printer - Error...", e);
printer = null;
disconnect();
} catch (ZebraPrinterLanguageUnknownException e) {
Log.v("EMO", "Printer - Unknown Printer Language", e);
printer = null;
disconnect();
}
}
}
return printer;
}
private void disconnect() {
synchronized (ZebraPrinter.lock) {
try {
if (printerConnection != null) {
printerConnection.close(); printerConnection.close();
printerConnection = null; printerConnection = null;
printer = null; printer = null;
} }
} catch (ConnectionException e) { }catch (Exception ex){
e.printStackTrace(); Log.v("EMO", "Printer - Failed to close connection before connecting", ex);
} }
//create a new BT connection
printerConnection = new BluetoothConnection(macAddress);
//check that it isn't null
if(printerConnection == null){
return false;
}
//open that connection
try {
printerConnection.open();
} catch (Exception e) {
Log.v("EMO", "Printer - Failed to open connection", e);
printerConnection = null;
printer = null;
return false;
}
//check if it opened
if (printerConnection != null && printerConnection.isConnected()) {
//try to get a printer
try {
printer = ZebraPrinterFactory.getInstance(printerConnection);
} catch (Exception e) {
Log.v("EMO", "Printer - Error...", e);
closePrinter();
return false;
}
return true;
}else {
//printer was null or not connected
return false;
}
}
}
private void disconnect() {
synchronized (ZebraPrinter.lock) {
closePrinter();
}
}
private void closePrinter(){
try {
if (printerConnection != null) {
printerConnection.close();
printerConnection = null;
}
printer = null;
} catch (ConnectionException e) {
e.printStackTrace();
} }
} }