mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-05 12:07:25 +00:00
Using default TLE sources if empty sources list passed for update
This commit is contained in:
1 parent
07db0378c5
commit
31fe18e4b5
3 files changed
+20
-11
No files matched your search
+2
-2
@@ -13,8 +13,8 @@ android {
|
|||||||
applicationId "com.rtbishop.look4sat"
|
applicationId "com.rtbishop.look4sat"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 30
|
||||||
versionCode 210
|
versionCode 211
|
||||||
versionName "2.1.0"
|
versionName "2.1.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -103,11 +103,16 @@ class SharedViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun updateEntriesFromSources(sources: List<TleSource>) {
|
fun updateEntriesFromSources(sources: List<TleSource>) {
|
||||||
|
val sourcesList = if (sources.isEmpty()) {
|
||||||
|
prefsManager.getDefaultSources()
|
||||||
|
} else {
|
||||||
|
sources
|
||||||
|
}
|
||||||
postAppEvent(Event(0))
|
postAppEvent(Event(0))
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
try {
|
try {
|
||||||
sourcesRepo.updateSources(sources)
|
sourcesRepo.updateSources(sourcesList)
|
||||||
entriesRepo.updateEntriesFromWeb(sources)
|
entriesRepo.updateEntriesFromWeb(sourcesList)
|
||||||
transmittersRepo.updateTransmitters()
|
transmittersRepo.updateTransmitters()
|
||||||
} catch (exception: Exception) {
|
} catch (exception: Exception) {
|
||||||
postAppEvent(Event(1))
|
postAppEvent(Event(1))
|
||||||
@@ -150,10 +155,6 @@ class SharedViewModel @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updateDefaultSourcesAndEntries() {
|
private fun updateDefaultSourcesAndEntries() {
|
||||||
val defaultTleSources = listOf(
|
updateEntriesFromSources(prefsManager.getDefaultSources())
|
||||||
TleSource("https://celestrak.com/NORAD/elements/active.txt"),
|
|
||||||
TleSource("https://amsat.org/tle/current/nasabare.txt")
|
|
||||||
)
|
|
||||||
updateEntriesFromSources(defaultTleSources)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,6 +23,7 @@ import android.content.SharedPreferences
|
|||||||
import android.hardware.GeomagneticField
|
import android.hardware.GeomagneticField
|
||||||
import androidx.core.content.edit
|
import androidx.core.content.edit
|
||||||
import com.github.amsacode.predict4java.GroundStationPosition
|
import com.github.amsacode.predict4java.GroundStationPosition
|
||||||
|
import com.rtbishop.look4sat.data.TleSource
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class PrefsManager @Inject constructor(val preferences: SharedPreferences) {
|
class PrefsManager @Inject constructor(val preferences: SharedPreferences) {
|
||||||
@@ -84,12 +85,19 @@ class PrefsManager @Inject constructor(val preferences: SharedPreferences) {
|
|||||||
fun shouldUseCompass(): Boolean {
|
fun shouldUseCompass(): Boolean {
|
||||||
return preferences.getBoolean(keyCompass, true)
|
return preferences.getBoolean(keyCompass, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isFirstLaunch(): Boolean {
|
fun isFirstLaunch(): Boolean {
|
||||||
return preferences.getBoolean(keyIsFirstLaunch, true)
|
return preferences.getBoolean(keyIsFirstLaunch, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setFirstLaunchDone() {
|
fun setFirstLaunchDone() {
|
||||||
preferences.edit { putBoolean(keyIsFirstLaunch, false) }
|
preferences.edit { putBoolean(keyIsFirstLaunch, false) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getDefaultSources(): List<TleSource> {
|
||||||
|
return listOf(
|
||||||
|
TleSource("https://celestrak.com/NORAD/elements/active.txt"),
|
||||||
|
TleSource("https://amsat.org/tle/current/nasabare.txt")
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user