Jackson Message Struct replacement

Author: fealXX

app/src/main/java/net/sharksystem/asap/android/lora/messages/ASAPLoRaMessage.java

@@ -1,9 +1,15 @@
 package net.sharksystem.asap.android.lora.messages;
 
+import android.os.Build;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
 public class ASAPLoRaMessage extends AbstractASAPLoRaMessage {
     //these need to be public to be picked up by the json automapper
     public String address;
     public byte[] message;
+    public String base64message;
 
     //Constructor for Jackson
     public ASAPLoRaMessage() {
@@ -14,15 +20,26 @@ public ASAPLoRaMessage() {
     public ASAPLoRaMessage(String address, byte[] message) {
         this.address = address;
         this.message = message;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { //TODO!
+            this.base64message = new String(Base64.getMimeEncoder().encode(message), StandardCharsets.UTF_8);
+        }
+    }
+
+    public ASAPLoRaMessage(String address, String base64message) {
+        this.address = address;
+        this.base64message = base64message.trim(); //whitespaces can be ignored, according to base64 RFC2045
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { //TODO!
+            this.message = Base64.getMimeDecoder().decode(this.base64message.getBytes(StandardCharsets.UTF_8));
+        }
     }
 
     @Override
     public String getPayload() {
-        return "MSSGE@" + this.address + ":" + this.message; //TODO Base64 the message?
+        return "MSSGE@" + this.address + ":" + this.base64message;
     }
 
     @Override
     public String toString() {
-        return "ASAPLoRaMessage (" + this.address + "): " + this.message;
+        return "ASAPLoRaMessage (" + this.address + ":" + this.base64message + "): " + new String(this.message);
     }
 }

app/src/main/java/net/sharksystem/asap/android/lora/messages/AbstractASAPLoRaMessage.java

@@ -1,16 +1,35 @@
 package net.sharksystem.asap.android.lora.messages;
 
+import android.util.Log;
+
 import net.sharksystem.asap.android.lora.ASAPLoRaException;
 
-//TODO
-//@JsonTypeInfo(use=JsonTypeInfo.Id.MINIMAL_CLASS, property="COMMAND")
-//@JsonSubTypes( {@JsonSubTypes.Type(DiscoverASAPLoRaMessage.class), @JsonSubTypes.Type(ASAPLoRaMessage.class)})
 public abstract class AbstractASAPLoRaMessage {
+    private static final String CLASS_LOG_TAG = "AbstractASAPLoRaMessage";
 
     public String getPayload() throws ASAPLoRaException {
         throw new ASAPLoRaException("Trying to call getPayload() on non-outgoing ASAP Message. This should never happen.");
     }
 
+    public static AbstractASAPLoRaMessage createASAPLoRaMessage(String rawMessage) throws ASAPLoRaException {
+        Log.i(CLASS_LOG_TAG, "Raw LoRa Message Received!");
+        Log.i(CLASS_LOG_TAG, "Creating AbstractASAPLoRaMessage from String: " + rawMessage);
+        // rawMessage is of format: <COMMAND (5 Char)>:<Payload>
+        String messageType = rawMessage.substring(0, 5);
+        String messagePayload = rawMessage.substring(6);
+        switch (messageType) {
+            case "DSCVR":
+                return new DiscoverASAPLoRaMessage(); //I don't think this can happen...?
+            case "DVDCR":
+                return new DeviceDiscoveredASAPLoRaMessage(messagePayload);
+            case "MSSGE":
+                String messageAddress = messagePayload.substring(0, 4);
+                String message = messagePayload.substring(5);
+                return new ASAPLoRaMessage(messageAddress, message);
+        }
+        throw new ASAPLoRaException("Recieved invalid Message Type: " + rawMessage);
+    }
+
     @Override
     public String toString() {
         return "AbstractASAPLoRaMessage derived class: " + this.getClass().getName();

app/src/main/java/net/sharksystem/asap/android/lora/messages/DeviceDiscoveredASAPLoRaMessage.java

@@ -1,18 +1,12 @@
 package net.sharksystem.asap.android.lora.messages;
 
 public class DeviceDiscoveredASAPLoRaMessage extends AbstractASAPLoRaMessage {
-    //needs to be public to be picked up by the json automapper
     public String address = "";
 
     public DeviceDiscoveredASAPLoRaMessage(String address) {
         this.address = address;
     }
 
-    //Constructor for Jackson
-    public DeviceDiscoveredASAPLoRaMessage() {
-        this.address = "";
-    }
-
     @Override
     public String toString() {
         return "DeviceDiscoveredASAPLoRaMessage: " + this.address;