Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update wifi sensor on state changes #734

Merged
merged 2 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package io.homeassistant.companion.android
import android.app.Application
import android.content.Intent
import android.content.IntentFilter
import android.net.wifi.WifiManager
import io.homeassistant.companion.android.common.dagger.AppComponent
import io.homeassistant.companion.android.common.dagger.Graph
import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
import io.homeassistant.companion.android.sensors.ChargingBroadcastReceiver
import io.homeassistant.companion.android.sensors.WifiStateReceiver

open class HomeAssistantApplication : Application(), GraphComponentAccessor {

Expand All @@ -26,6 +28,9 @@ open class HomeAssistantApplication : Application(), GraphComponentAccessor {
addAction(Intent.ACTION_POWER_DISCONNECTED)
}
)

// This will trigger an update any time the wifi state has changed
registerReceiver(WifiStateReceiver(), IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION))
}

override val appComponent: AppComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class NetworkSensorManager : SensorManager {
(context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager)
val conInfo = wifiManager.connectionInfo

val wifiEnabled = wifiManager.isWifiEnabled

val ssid = if (conInfo.networkId == -1) {
"<not connected>"
} else {
Expand Down Expand Up @@ -77,6 +79,7 @@ class NetworkSensorManager : SensorManager {
"ip_address" to getIpAddress(conInfo.ipAddress),
"link_speed" to conInfo.linkSpeed,
"is_hidden" to conInfo.hiddenSSID,
"is_wifi_on" to wifiEnabled,
"frequency" to conInfo.frequency,
"signal_level" to lastScanStrength
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ interface SensorComponent {
fun inject(worker: SensorWorker)

fun inject(receiver: NextAlarmReceiver)

fun inject(receiver: WifiStateReceiver)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package io.homeassistant.companion.android.sensors

import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.net.wifi.WifiManager
import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
import io.homeassistant.companion.android.domain.integration.IntegrationUseCase
import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch

class WifiStateReceiver() : BroadcastReceiver() {

@Inject
lateinit var integrationUseCase: IntegrationUseCase
private val ioScope = CoroutineScope(Dispatchers.IO)
var updateJob: Job? = null
override fun onReceive(context: Context, intent: Intent) {

val wifiState = intent.getIntExtra(
WifiManager.EXTRA_WIFI_STATE,
WifiManager.WIFI_STATE_UNKNOWN
)

if (wifiState < 0) {
return
}

DaggerSensorComponent
.builder()
.appComponent((context.applicationContext as GraphComponentAccessor).appComponent)
.build()
.inject(this)

updateJob?.cancel()
updateJob = ioScope.launch {
AllSensorsUpdaterImpl(integrationUseCase, context).updateSensors()
}
}
}