mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-25 16:31:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up startDownload

Browse Source
This commit is contained in:
andrekir
2023-07-31 18:33:00 -03:00
parent 206a1378cc
commit a8b8f7c4e0
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
View File

@@ -126,7 +126,6 @@ fun MapView(model: UIViewModel = viewModel()) {
var zoomLevelMax = 0.0
// Map Elements
var writer: SqliteArchiveTileWriter
var downloadRegionBoundingBox: BoundingBox? by remember { mutableStateOf(null) }
val context = LocalContext.current
@@ -313,10 +312,8 @@ fun MapView(model: UIViewModel = viewModel()) {
context,
R.string.map_download_complete,
Toast.LENGTH_LONG
)
.show()
).show()
writer.onDetach()
//defaultMapSettings()
}
override fun onTaskFailed(errors: Int) {
@@ -326,7 +323,6 @@ fun MapView(model: UIViewModel = viewModel()) {
Toast.LENGTH_LONG
).show()
writer.onDetach()
// defaultMapSettings()
}
override fun updateProgress(
@@ -496,9 +492,12 @@ fun MapView(model: UIViewModel = viewModel()) {
fun startDownload() {
val boundingBox = downloadRegionBoundingBox ?: return
try {
val outputName =
Configuration.getInstance().osmdroidBasePath.absolutePath + File.separator + "mainFile.sqlite" // TODO: Accept filename input param from user
writer = SqliteArchiveTileWriter(outputName)
val outputName = buildString {
append(Configuration.getInstance().osmdroidBasePath.absolutePath)
append(File.separator)
append("mainFile.sqlite") // TODO: Accept filename input param from user
}
val writer = SqliteArchiveTileWriter(outputName)
val cacheManager = CacheManager(map, writer) // Make sure cacheManager has latest from map
//this triggers the download
downloadRegion(