mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-16 14:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove call number sensor due to policy changes at Google. (#1072)

Browse source 
* Remove call number sensor due to policy changes at Google.

* Remove missed reference.
This commit is contained in:
Justin Bassett 2020-10-17 23:16:14 -04:00 committed by GitHub
parent 37c176bed4
commit 4490ddec88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -15,7 +15,6 @@
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />

42
app/src/main/java/io/homeassistant/companion/android/sensors/PhoneStateSensorManager.kt
View file

@ -2,7 +2,6 @@ package io.homeassistant.companion.android.sensors
import android.Manifest
import android.content.Context
import android.content.Intent
import android.os.Build
import android.telephony.SubscriptionInfo
import android.telephony.SubscriptionManager
@ -20,13 +19,6 @@ class PhoneStateSensorManager : SensorManager {
R.string.sensor_description_phone_state
)
val callNumber = SensorManager.BasicSensor(
"call_number",
"sensor",
R.string.basic_sensor_name_call_number,
R.string.sensor_description_call_number
)
val sim_1 = SensorManager.BasicSensor(
"sim_1",
"sensor",
@ -49,13 +41,11 @@ class PhoneStateSensorManager : SensorManager {
override val availableSensors: List<SensorManager.BasicSensor>
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1)
listOf(phoneState, callNumber, sim_1, sim_2)
else listOf(phoneState, callNumber)
listOf(phoneState, sim_1, sim_2)
else listOf(phoneState)
override fun requiredPermissions(sensorId: String): Array<String> {
return if (sensorId == callNumber.id) {
arrayOf(Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_CALL_LOG)
} else arrayOf(Manifest.permission.READ_PHONE_STATE)
return arrayOf(Manifest.permission.READ_PHONE_STATE)
}
override fun requestSensorUpdate(
@ -67,7 +57,7 @@ class PhoneStateSensorManager : SensorManager {
}
private fun checkPhoneState(context: Context) {
if (isEnabled(context, phoneState.id) || isEnabled(context, callNumber.id)) {
if (isEnabled(context, phoneState.id)) {
var currentPhoneState = "unknown"
if (checkPermission(context, phoneState.id)) {
@ -81,11 +71,8 @@ class PhoneStateSensorManager : SensorManager {
else -> "unknown"
}
}
if (isEnabled(context, phoneState.id))
updatePhoneStateSensor(context, currentPhoneState)
if (isEnabled(context, callNumber.id) && currentPhoneState in arrayOf("idle", "unknown"))
updateCallNumberSensor(context, "none")
updatePhoneStateSensor(context, currentPhoneState)
}
}
@ -102,25 +89,6 @@ class PhoneStateSensorManager : SensorManager {
)
}
fun updateCallNumber(context: Context, intent: Intent) {
if (checkPermission(context, callNumber.id)) {
if (intent.hasExtra(TelephonyManager.EXTRA_INCOMING_NUMBER)) {
intent.getStringExtra(TelephonyManager.EXTRA_INCOMING_NUMBER)?.let {
updateCallNumberSensor(context, it)
}
}
}
}
private fun updateCallNumberSensor(context: Context, number: String) {
onSensorUpdated(context,
callNumber,
number,
"mdi:numeric",
mapOf()
)
}
private fun updateSimSensor(context: Context, slotIndex: Int) {
val basicSimSensor = when (slotIndex) {
0 -> sim_1

6
app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
View file

@ -8,7 +8,6 @@ import android.content.Context
import android.content.Intent
import android.media.AudioManager
import android.os.PowerManager
import android.telephony.TelephonyManager
import android.util.Log
import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
@ -97,11 +96,6 @@ class SensorReceiver : BroadcastReceiver() {
}
}
if (intent.action.equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED) &&
isSensorEnabled(context, PhoneStateSensorManager.callNumber.id)) {
PhoneStateSensorManager().updateCallNumber(context, intent)
}
ioScope.launch {
updateSensors(context, integrationUseCase)
if (chargingActions.contains(intent.action)) {