Refactoring

codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java

@@ -331,7 +331,7 @@ public class AppWorker extends Thread {
 
         @Override
         protected void onTransmitPosition(Position position) {
-            _positionItemRepository.insertPositionItem(position.toPositionItem(true));
+            _positionItemRepository.upsertPositionItem(position.toPositionItem(true));
         }
 
         @Override

codec2talkie/src/main/java/com/radio/codec2talkie/storage/position/PositionItem.java

@@ -109,6 +109,7 @@ public class PositionItem {
 
     public static boolean equalTo(PositionItem positionItem1, PositionItem positionItem2) {
         return positionItem1.getSrcCallsign().equals(positionItem2.getSrcCallsign()) &
+               positionItem1.getIsTransmit() == positionItem2.getIsTransmit() &&
                Math.abs(positionItem1.getLongitude() - positionItem2.getLongitude()) <= MIN_COORDINATE_CHANGE_DELTA &
                Math.abs(positionItem1.getLatitude() - positionItem2.getLatitude()) <= MIN_COORDINATE_CHANGE_DELTA;
     }

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

@@ -9,8 +9,8 @@ import androidx.room.Update;
 public interface StationItemDao {
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    void insertStation(StationItem stationItem);
+    void insertStationItem(StationItem stationItem);
 
     @Update(onConflict = OnConflictStrategy.IGNORE)
-    void updateStation(StationItem stationItem);
+    void updateStationItem(StationItem stationItem);
 }

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

@@ -0,0 +1,32 @@
+package com.radio.codec2talkie.storage.station;
+
+import android.app.Application;
+import android.util.Log;
+
+import androidx.lifecycle.LiveData;
+
+import com.radio.codec2talkie.maps.MapActivity;
+import com.radio.codec2talkie.storage.AppDatabase;
+import com.radio.codec2talkie.tools.DateTools;
+
+import java.util.List;
+
+public class StationItemRepository {
+    private static final String TAG = StationItemRepository.class.getSimpleName();
+
+    private final StationItemDao _stationItemDao;
+
+    public StationItemRepository(Application application) {
+        AppDatabase appDatabase = AppDatabase.getDatabase(application);
+        _stationItemDao = appDatabase.stationitemDao();
+    }
+
+    public void insertStationItem(StationItem stationItem) {
+        AppDatabase.getDatabaseExecutor().execute(() -> _stationItemDao.insertStationItem(stationItem));
+    }
+
+    public void upsertStationItem(StationItem stationItem) {
+        AppDatabase.getDatabaseExecutor().execute(() -> {
+        });
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.radio.codec2talkie.storage.station;
+
+import android.app.Application;
+import android.text.format.DateUtils;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+
+import com.radio.codec2talkie.storage.station.StationItemRepository;
+import com.radio.codec2talkie.tools.DateTools;
+
+import java.util.List;
+
+public class StationItemViewModel extends AndroidViewModel {
+
+    private final StationItemRepository _stationItemRepository;
+
+    public StationItemViewModel(@NonNull Application application) {
+        super(application);
+        _stationItemRepository = new StationItemRepository(application);
+    }
+}