Refactor

codec2talkie/src/main/java/com/radio/codec2talkie/storage/AppDatabase.java

@@ -13,13 +13,15 @@ import com.radio.codec2talkie.storage.message.MessageItem;
 import com.radio.codec2talkie.storage.message.MessageItemDao;
 import com.radio.codec2talkie.storage.position.PositionItem;
 import com.radio.codec2talkie.storage.position.PositionItemDao;
+import com.radio.codec2talkie.storage.station.StationItem;
+import com.radio.codec2talkie.storage.station.StationItemDao;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 @androidx.room.Database(
     version = 6,
-    entities = {LogItem.class, MessageItem.class, PositionItem.class},
+    entities = {LogItem.class, MessageItem.class, PositionItem.class, StationItem.class},
     exportSchema = false
 )
 public abstract class AppDatabase extends RoomDatabase {
@@ -29,6 +31,7 @@ public abstract class AppDatabase extends RoomDatabase {
     public abstract LogItemDao logItemDao();
     public abstract MessageItemDao messageItemDao();
     public abstract PositionItemDao positionItemDao();
+    public abstract StationItemDao stationitemDao();
 
     private static AppDatabase _db;
     private static ExecutorService _executor;

codec2talkie/src/main/java/com/radio/codec2talkie/storage/log/LogItemDao.java

@@ -17,6 +17,7 @@ public interface LogItemDao {
     void insertLogItem(LogItem logItem);
 
     @Query("SELECT pos.timestampEpoch AS timestampEpoch, " +
+            "pos.id AS id, " +
             "log.srcCallsign AS srcCallsign, " +
             "log.logLine AS logLine," +
             "pos.dstCallsign AS dstCallsign, " +
@@ -38,6 +39,7 @@ public interface LogItemDao {
             "GROUP BY log.srcCallsign " +
             "UNION " +
             "SELECT pos.timestampEpoch AS timestampEpoch, " +
+            "pos.id AS id, " +
             "pos.srcCallsign AS srcCallsign, " +
             "log.logLine AS logLine," +
             "pos.dstCallsign AS dstCallsign, " +
@@ -61,6 +63,7 @@ public interface LogItemDao {
     LiveData<List<StationItem>> getLastPositions();
 
     @Query("SELECT pos.timestampEpoch AS timestampEpoch, " +
+            "pos.id AS id, " +
             "pos.srcCallsign AS srcCallsign, " +
             "pos.dstCallsign AS dstCallsign, " +
             "pos.latitude AS latitude, " +

codec2talkie/src/main/java/com/radio/codec2talkie/storage/station/StationItem.java

@@ -1,6 +1,13 @@
 package com.radio.codec2talkie.storage.station;
 
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+@Entity
 public class StationItem {
+
+    @PrimaryKey(autoGenerate = true)
+    private long id;
     private long timestampEpoch;
     private String srcCallsign;
     public String dstCallsign;
@@ -18,6 +25,10 @@ public class StationItem {
     public double rangeMiles;
     public int directivityDeg;
 
+    public long getId() {
+        return id;
+    }
+
     public long getTimestampEpoch() { return timestampEpoch; }
 
     public String getSrcCallsign() { return srcCallsign; }
@@ -50,6 +61,10 @@ public class StationItem {
 
     public int getDirectivityDeg() { return directivityDeg; }
 
+    public void setId(long id) {
+        this.id = id;
+    }
+
     public void setTimestampEpoch(long timestampEpoch) { this.timestampEpoch = timestampEpoch; }
 
     public void setSrcCallsign(String srcCallsign) { this.srcCallsign = srcCallsign; }

codec2talkie/src/main/java/com/radio/codec2talkie/storage/station/StationItemDao.java

@@ -5,14 +5,12 @@ import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Update;
 
-import com.radio.codec2talkie.storage.position.PositionItem;
-
 @Dao
 public interface StationItemDao {
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    void insertStation(StationItem logItem);
+    void insertStation(StationItem stationItem);
 
     @Update(onConflict = OnConflictStrategy.IGNORE)
-    void updateStation(PositionItem logItem);
+    void updateStation(StationItem stationItem);
 }