Refactor sync

Author: bubelov

app/src/main/kotlin/map/MapFragment.kt

@@ -40,19 +40,23 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.sqlite.SQLiteConnection
+import api.Api
 import app.dpToPx
 import area.AreaResultModel
 import area.bounds
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import element.ElementFragment
 import element.ElementsCluster
 import element.ElementsRepo
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.btcmap.R
 import org.btcmap.databinding.FragmentMapBinding
@@ -521,15 +525,17 @@ class MapFragment : Fragment() {
 
                 if (elementsRepo.selectCount() == 0L && elementsRepo.hasBundledElements()) {
                     elementsRepo.fetchBundledElements()
-
-                    binding.map.getMapAsync { map ->
-                        model.loadItems(
-                            bounds = map.projection.visibleRegion.latLngBounds,
-                            zoom = map.cameraPosition.zoom,
-                            filter = MapModel.Filter.Merchants,
-                        )
-                    }
+                    refreshData()
                 }
+
+                elementsRepo.sync()
+                refreshData()
+
+                val api by inject<Api>()
+                val conn by inject<SQLiteConnection>()
+                val events = api.getEvents()
+                withContext(Dispatchers.IO) { event.deleteAllAndInsertBatch(events, conn) }
+                refreshData()
             }
         }
 
@@ -667,20 +673,7 @@ class MapFragment : Fragment() {
             prefs.mapViewport =
                 map.projection.visibleRegion.latLngBounds
 
-            val filter =
-                if (binding.filterMerchantsActive.isVisible) {
-                    MapModel.Filter.Merchants
-                } else if (binding.filterEventsActive.isVisible) {
-                    MapModel.Filter.Events
-                } else {
-                    MapModel.Filter.Exchanges
-                }
-
-            model.loadItems(
-                bounds = map.projection.visibleRegion.latLngBounds,
-                zoom = map.cameraPosition.zoom,
-                filter = filter,
-            )
+            refreshData()
 
             searchModel.setLocation(
                 LatLng(
@@ -690,6 +683,27 @@ class MapFragment : Fragment() {
         }
     }
 
+    private fun refreshData() {
+        binding.map.getMapAsync { map ->
+            viewLifecycleOwner.lifecycleScope.launch {
+                val filter =
+                    if (binding.filterMerchantsActive.isVisible) {
+                        MapModel.Filter.Merchants
+                    } else if (binding.filterEventsActive.isVisible) {
+                        MapModel.Filter.Events
+                    } else {
+                        MapModel.Filter.Exchanges
+                    }
+
+                model.loadItems(
+                    bounds = map.projection.visibleRegion.latLngBounds,
+                    zoom = map.cameraPosition.zoom,
+                    filter = filter,
+                )
+            }
+        }
+    }
+
     private fun BottomSheetBehavior<*>.addSlideCallback() {
         addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
             override fun onStateChanged(bottomSheet: View, newState: Int) {

app/src/main/kotlin/map/MapModel.kt

@@ -37,7 +37,7 @@ class MapModel(
     fun loadItems(bounds: LatLngBounds, zoom: Double, filter: Filter) {
         prevLoadItems?.cancel()
 
-        viewModelScope.launch {
+        prevLoadItems = viewModelScope.launch {
             withContext(Dispatchers.IO) {
                 when (filter) {
                     Filter.Merchants -> {