mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-15 12:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we have permissions before trying to get Wifi data (#669)

Browse source
This commit is contained in:
Justin Bassett 2020-07-15 00:49:38 -04:00 committed by GitHub
parent 00324f0747
commit 359bcefef4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/io/homeassistant/companion/android/sensors/NetworkSensorManager.kt
View file

@ -2,19 +2,27 @@ package io.homeassistant.companion.android.sensors
import android.content.Context
import android.net.wifi.WifiManager
import android.util.Log
import io.homeassistant.companion.android.domain.integration.Sensor
import io.homeassistant.companion.android.domain.integration.SensorRegistration
import io.homeassistant.companion.android.util.PermissionManager
class NetworkSensorManager : SensorManager {
companion object {
private const val TAG = "NetworkSM"
}
override fun getSensorRegistrations(context: Context): List<SensorRegistration<Any>> {
val sensorRegistrations = mutableListOf<SensorRegistration<Any>>()
sensorRegistrations.add(
SensorRegistration(
getWifiConnectionSensor(context),
"Wifi Connection"
getWifiConnectionSensor(context)?.let {
sensorRegistrations.add(
SensorRegistration(
it,
"Wifi Connection"
)
)
)
}
return sensorRegistrations
}
@ -22,12 +30,18 @@ class NetworkSensorManager : SensorManager {
override fun getSensors(context: Context): List<Sensor<Any>> {
val sensors = mutableListOf<Sensor<Any>>()
sensors.add(getWifiConnectionSensor(context))
getWifiConnectionSensor(context)?.let {
sensors.add(it)
}
return sensors
}
private fun getWifiConnectionSensor(context: Context): Sensor<Any> {
private fun getWifiConnectionSensor(context: Context): Sensor<Any>? {
if (!PermissionManager.checkLocationPermission(context)) {
Log.w(TAG, "Tried getting wifi info without permission.")
return null
}
val wifiManager =
(context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager)
val conInfo = wifiManager.connectionInfo