Handle auto reply messages

sh123 · Jul 16, 2023 · 854bd62 · 854bd62
1 parent 1edf1c4
commit 854bd62
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java b/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java
@@ -299,7 +299,11 @@ protected void onReceiveTextMessage(TextMessage textMessage) {
             String note = (textMessage.src == null ? "UNK" : textMessage.src) + "→" +
                     (textMessage.dst == null ? "UNK" : textMessage.dst);
             sendStatusUpdate(AppMessage.EV_TEXT_MESSAGE_RECEIVED, note + ": " + textMessage.text);
-            _messageItemRepository.insertMessageItem(textMessage.toMessageItem(false));
+            if (textMessage.isAutoReply()) {
+                // TODO, acknowledge or reject message with the given (src, dst, ackId)
+            } else {
+                _messageItemRepository.insertMessageItem(textMessage.toMessageItem(false));
+            }
             Log.i(TAG, "message received: " + textMessage.text);
         }
 
@@ -342,7 +346,9 @@ protected void onTransmitTextMessage(TextMessage textMessage) {
             String note = (textMessage.src == null ? "UNK" : textMessage.src) + "→" +
                     (textMessage.dst == null ? "UNK" : textMessage.dst);
             sendStatusUpdate(AppMessage.EV_TEXT_MESSAGE_TRANSMITTED, note);
-            _messageItemRepository.insertMessageItem(textMessage.toMessageItem(true));
+            if (!textMessage.isAutoReply()) {
+                _messageItemRepository.insertMessageItem(textMessage.toMessageItem(true));
+            }
         }
 
         @Override

diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/message/TextMessage.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/message/TextMessage.java
@@ -2,6 +2,8 @@
 
 import com.radio.codec2talkie.storage.message.MessageItem;
 
+import java.util.Locale;
+
 public class TextMessage {
     public String src;
     public String dst;
@@ -21,4 +23,20 @@ public MessageItem toMessageItem(boolean isTransmit) {
         messageItem.setRetryCnt(0);
         return messageItem;
     }
+
+    public boolean isAck() {
+        return this.text != null &&
+                this.text.toLowerCase(Locale.ROOT).equals("ack") &&
+                this.ackId > 0;
+    }
+
+    public boolean isRej() {
+        return this.text != null &&
+                this.text.toLowerCase(Locale.ROOT).equals("rej") &&
+                this.ackId > 0;
+    }
+
+    public boolean isAutoReply() {
+        return isAck() || isRej();
+    }
 }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/storage/AppDatabase.java b/codec2talkie/src/main/java/com/radio/codec2talkie/storage/AppDatabase.java
@@ -20,7 +20,7 @@
 import java.util.concurrent.Executors;
 
 @androidx.room.Database(
-    version = 12,
+    version = 13,
     entities = {LogItem.class, MessageItem.class, PositionItem.class, StationItem.class},
     exportSchema = false
 )

diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/storage/message/MessageItem.java b/codec2talkie/src/main/java/com/radio/codec2talkie/storage/message/MessageItem.java
@@ -4,7 +4,7 @@
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
-@Entity(indices = {@Index(value = {"id", "srcCallsign", "ackId"}, unique = true)})
+@Entity(indices = {@Index(value = {"id", "srcCallsign", "dstCallsign", "ackId"}, unique = true)})
 public class MessageItem {
 
     @PrimaryKey(autoGenerate = true)