diff options
Diffstat (limited to 'Software/Android_Studio/Tango.Integration/src/main/java')
| -rw-r--r-- | Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java index 24ae72eba..99e2293ae 100644 --- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java +++ b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java @@ -100,7 +100,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal sendPacket = new DatagramPacket(packet, packet.length, InetAddress.getByName("255.255.255.255"), 8888); socket.send(sendPacket); - } catch (IOException e) + } + catch (IOException e) { XLog.e(e); } @@ -122,7 +123,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal for (int k = 0; k < 4; k++) quads[k] = (byte) ((broadcast >> k * 8) & 0xFF); return InetAddress.getByAddress(quads); - } else + } + else { return null; } @@ -135,7 +137,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal try { listener.close(); - } catch (IOException e) + } + catch (IOException e) { e.printStackTrace(); } @@ -178,7 +181,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal connect().blockingAwait(); } - } catch (IOException e) + } + catch (IOException e) { XLog.e(e); } @@ -206,7 +210,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal ExternalClientLoginResponse.class, ExternalClientLoginResponse.newBuilder().setAuthenticated(true).build(), container.getToken())); - } else + } + else { getAdapters().get(0).setAuthenticated(false); sendResponse(MessageFactory.createTangoMessage( @@ -231,7 +236,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal //noinspection unchecked receiver.handler.invoke(this, new MessageReceivedArgs(container, message)); } - } else + } + else { //Route to machine... if (container.getContinuous()) @@ -242,9 +248,13 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal sendResponse((TangoMessage<? extends GeneratedMessageV3>) response); }, (ex) -> { - sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException)ex).getResponse()); + if (ex.getClass() == ResponseErrorException.class) + { + sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException) ex).getResponse()); + } }); - } else + } + else { //noinspection unchecked machineOperator.sendRequest(MessageFactory.createTangoMessage(container, message)).subscribe((response) -> @@ -252,16 +262,21 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal sendResponse((TangoMessage<? extends GeneratedMessageV3>) response); }, (ex) -> { - sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException)ex).getResponse()); + if (ex.getClass() == ResponseErrorException.class) + { + sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException) ex).getResponse()); + } }); } } - } else + } + else { XLog.w("Message received from an unauthorized adapter!"); } - } catch (Exception e) + } + catch (Exception e) { XLog.e(e); } |