lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Weather: use fine location if available

Browse Source 
Close #230
This commit is contained in:
MM20 2023-05-13 18:42:01 +02:00
parent 674f4e7f9e
commit 6e5cfb2737
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/weather/src/main/java/de/mm20/launcher2/weather/WeatherProvider.kt
View File

@ -3,6 +3,7 @@ package de.mm20.launcher2.weather
import android.Manifest import android.Manifest
import android.content.Context import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.location.Location
import android.location.LocationManager import android.location.LocationManager
import androidx.core.content.edit import androidx.core.content.edit
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
@ -26,30 +27,35 @@ abstract class WeatherProvider<T : WeatherLocation> {
suspend fun fetchNewWeatherData(): List<Forecast>? { suspend fun fetchNewWeatherData(): List<Forecast>? {
val result: WeatherUpdateResult<T> val result: WeatherUpdateResult<T> = if (autoLocation) {
if (autoLocation) { val location = getCurrentLocation()
if (context.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) { if (location != null) {
val lm = context.getSystemService<LocationManager>()!! loadWeatherData(location.latitude, location.longitude) ?: return null
val location = lm.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
if (location != null) {
result = loadWeatherData(location.latitude, location.longitude) ?: return null
} else {
val lastLocation = getLastLocation() ?: return null
result = loadWeatherData(lastLocation) ?: return null
}
} else { } else {
val lastLocation = getLastLocation() ?: return null val lastLocation = getLastLocation() ?: return null
result = loadWeatherData(lastLocation) ?: return null loadWeatherData(lastLocation) ?: return null
} }
} else { } else {
val setLocation = getLocation() ?: return null val setLocation = getLocation() ?: return null
result = loadWeatherData(setLocation) ?: return null loadWeatherData(setLocation) ?: return null
} }
saveLastLocation(result.location) saveLastLocation(result.location)
setLastUpdate(System.currentTimeMillis()) setLastUpdate(System.currentTimeMillis())
return result.forecasts return result.forecasts
} }
private fun getCurrentLocation(): Location? {
val lm = context.getSystemService<LocationManager>()!!
var location: Location? = null
if (context.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
location = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER)
}
if (location == null && context.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
location = lm.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
}
return location
}
internal abstract suspend fun loadWeatherData(location: T): WeatherUpdateResult<T>? internal abstract suspend fun loadWeatherData(location: T): WeatherUpdateResult<T>?
internal abstract suspend fun loadWeatherData(lat: Double, lon: Double): WeatherUpdateResult<T>? internal abstract suspend fun loadWeatherData(lat: Double, lon: Double): WeatherUpdateResult<T>?