Jackson Message struct replacement in LoRaEngine

Author: fealXX

app/src/main/java/net/sharksystem/asap/android/lora/LoRaBTInputOutputStream.java

@@ -43,6 +43,8 @@ public class LoRaBTInputOutputStream {
 
     public void close() {
         try {
+            //TODO Cleanup all loRaASAPOutputStreams
+            //TODO Cleanup all loRaASAPInputStreams
             if (this.btSocket != null)
                 btSocket.close();
         } catch (IOException e) {
@@ -81,9 +83,12 @@ public void flushASAPOutputStreams() throws IOException {
 
     static class LoRaBTInputStream extends FilterInputStream {
 
-        public AbstractASAPLoRaMessage readASAPLoRaMessage(){
+        public AbstractASAPLoRaMessage readASAPLoRaMessage() throws IOException, ASAPLoRaException {
             BufferedReader br = new BufferedReader(new InputStreamReader(this));
-            return null;//TODO objectMapper.readValue(br.readLine(), AbstractASAPLoRaMessage.class);
+            String rawASAPLoRaMessage = br.readLine();
+            Log.i(CLASS_LOG_TAG, "Reading Message from BT Board: " + rawASAPLoRaMessage);
+            //TODO do not use empty line
+            return AbstractASAPLoRaMessage.createASAPLoRaMessage(rawASAPLoRaMessage);
         }
 
         public LoRaBTInputStream(InputStream in) {

app/src/main/java/net/sharksystem/asap/android/lora/LoRaCommunicationManager.java

@@ -27,6 +27,7 @@ public class LoRaCommunicationManager extends Thread {
      * - Discovery neuer Peers und Benachrichtigung der @{@link LoRaEngine}
      */
     private static final String CLASS_LOG_TAG = "ASAPLoRaCommManager";
+    private static final long FLUSH_BUFFER_TIMEOUT = 250;
     private static LoRaBTInputOutputStream ioStream = null;
     private BluetoothDevice btDevice = null;
 
@@ -76,29 +77,31 @@ public void run() {
             //this.ioStream.getOutputStream().write(new RawASAPLoRaMessage("AT"));
             this.ioStream.getOutputStream().write(new DiscoverASAPLoRaMessage()); //TODO, do this periodically?
             //this.ioStream.getOutputStream().write(new ASAPLoRaMessage("A2FF", "Hi there!"));
-
+            long lastBufferFlush = System.currentTimeMillis();
             while (!this.isInterrupted()) {
-                if (this.ioStream.getInputStream().available() > 0) {
-                    AbstractASAPLoRaMessage asapLoRaMessage = this.ioStream.getInputStream().readASAPLoRaMessage();
-                    Log.i(this.CLASS_LOG_TAG, "Message recieved: " + asapLoRaMessage.toString());
-                    //TODO, this is smelly... visitorpattern? handleMessage() in abstract?
-                    if (asapLoRaMessage instanceof ASAPLoRaMessage) {
-                        //New Message inbound, write to corresponding stream of ASAPPeer
-                        this.ioStream.getASAPInputStream(((ASAPLoRaMessage) asapLoRaMessage).address).appendData(((ASAPLoRaMessage) asapLoRaMessage).message);
-                    } else if (asapLoRaMessage instanceof DeviceDiscoveredASAPLoRaMessage) {
-                        //New Device in Range found
-                        LoRaEngine.getASAPLoRaEngine().tryConnect(((DeviceDiscoveredASAPLoRaMessage) asapLoRaMessage).address);
-                    } else if (asapLoRaMessage instanceof ErrorASAPLoRaMessage) {
-                        //LoRa Error occured
-                        // TODO
+                //Periodically flush Buffers
+                if ((System.currentTimeMillis() - lastBufferFlush) > this.FLUSH_BUFFER_TIMEOUT) {
+                    if (this.ioStream.getInputStream().available() > 0) {
+                        AbstractASAPLoRaMessage asapLoRaMessage = this.ioStream.getInputStream().readASAPLoRaMessage();
+                        Log.i(this.CLASS_LOG_TAG, "Message recieved: " + asapLoRaMessage.toString());
+                        //TODO, this is smelly... visitorpattern? handleMessage() in abstract?
+                        if (asapLoRaMessage instanceof ASAPLoRaMessage) {
+                            //New Message inbound, write to corresponding stream of ASAPPeer
+                            this.ioStream.getASAPInputStream(((ASAPLoRaMessage) asapLoRaMessage).address).appendData(((ASAPLoRaMessage) asapLoRaMessage).message);
+                        } else if (asapLoRaMessage instanceof DeviceDiscoveredASAPLoRaMessage) {
+                            //New Device in Range found
+                            LoRaEngine.getASAPLoRaEngine().tryConnect(((DeviceDiscoveredASAPLoRaMessage) asapLoRaMessage).address);
+                        } else if (asapLoRaMessage instanceof ErrorASAPLoRaMessage) {
+                            //LoRa Error occured
+                            // TODO
+                        }
                     }
-                }
 
-                //Periodically flush Write Buffers
-                this.ioStream.flushASAPOutputStreams();
-                //LoRa is slow, we really don't need to run at full steam all the time
-                try { Thread.sleep(250); } catch (InterruptedException e) {}
+                    this.ioStream.flushASAPOutputStreams();
+                    lastBufferFlush = System.currentTimeMillis();
+                }
             }
+            Log.i(CLASS_LOG_TAG, "Thread was interrupted, shutting down.");
         } catch (IOException | ASAPLoRaException e) {
             Log.e(this.CLASS_LOG_TAG, e.getMessage());
             //throw new ASAPLoRaException(e);