diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a18ef4df2..35d4517db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
-
diff --git a/app/src/main/java/io/homeassistant/companion/android/sensors/PhoneStateSensorManager.kt b/app/src/main/java/io/homeassistant/companion/android/sensors/PhoneStateSensorManager.kt
index 6e83f7df7..50abb360c 100644
--- a/app/src/main/java/io/homeassistant/companion/android/sensors/PhoneStateSensorManager.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/sensors/PhoneStateSensorManager.kt
@@ -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
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 {
- 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
diff --git a/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt b/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
index 30a4c7614..a77bcd557 100644
--- a/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/sensors/SensorReceiver.kt
@@ -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)) {