From 209497e0a27c7a3a39fde6c49183c8191bda2667 Mon Sep 17 00:00:00 2001 From: Jorden <37350695+SkechyWolf@users.noreply.github.com> Date: Wed, 26 Oct 2022 08:32:53 -0700 Subject: [PATCH] Fix global vars in bedtime and theater mode (#3001) --- .../companion/android/sensors/BedtimeModeSensorManager.kt | 4 ++-- .../companion/android/sensors/OnBodySensorManager.kt | 2 +- .../companion/android/sensors/TheaterModeSensorManager.kt | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wear/src/main/java/io/homeassistant/companion/android/sensors/BedtimeModeSensorManager.kt b/wear/src/main/java/io/homeassistant/companion/android/sensors/BedtimeModeSensorManager.kt index b8e5f24e1..2ae01cc39 100755 --- a/wear/src/main/java/io/homeassistant/companion/android/sensors/BedtimeModeSensorManager.kt +++ b/wear/src/main/java/io/homeassistant/companion/android/sensors/BedtimeModeSensorManager.kt @@ -23,7 +23,7 @@ class BedtimeModeSensorManager : SensorManager { } override fun docsLink(): String { - return "https://companion.home-assistant.io/docs/core/sensors#bedtime-mode-sensor" + return "https://companion.home-assistant.io/docs/wear-os/#sensors" } override val enabledByDefault: Boolean get() = false @@ -52,7 +52,7 @@ class BedtimeModeSensorManager : SensorManager { return val state = try { - Settings.Global.getInt(context.contentResolver, "bedtime_mode") == 1 + Settings.Global.getInt(context.contentResolver, if (Build.MANUFACTURER == "samsung") "setting_bedtime_mode_running_state" else "bedtime_mode") == 1 } catch (e: Exception) { Log.e(TAG, "Unable to update bedtime mode sensor", e) false diff --git a/wear/src/main/java/io/homeassistant/companion/android/sensors/OnBodySensorManager.kt b/wear/src/main/java/io/homeassistant/companion/android/sensors/OnBodySensorManager.kt index 13d7cd57c..b70ec51f9 100755 --- a/wear/src/main/java/io/homeassistant/companion/android/sensors/OnBodySensorManager.kt +++ b/wear/src/main/java/io/homeassistant/companion/android/sensors/OnBodySensorManager.kt @@ -30,7 +30,7 @@ class OnBodySensorManager : SensorManager, SensorEventListener { private lateinit var mySensorManager: android.hardware.SensorManager override fun docsLink(): String { - return "https://companion.home-assistant.io/docs/core/sensors#on-body-sensor" + return "https://companion.home-assistant.io/docs/wear-os/#sensors" } override val enabledByDefault: Boolean get() = false diff --git a/wear/src/main/java/io/homeassistant/companion/android/sensors/TheaterModeSensorManager.kt b/wear/src/main/java/io/homeassistant/companion/android/sensors/TheaterModeSensorManager.kt index ffe7658a5..fd7455a6a 100755 --- a/wear/src/main/java/io/homeassistant/companion/android/sensors/TheaterModeSensorManager.kt +++ b/wear/src/main/java/io/homeassistant/companion/android/sensors/TheaterModeSensorManager.kt @@ -1,6 +1,7 @@ package io.homeassistant.companion.android.sensors import android.content.Context +import android.os.Build import android.provider.Settings import android.util.Log import io.homeassistant.companion.android.common.sensors.SensorManager @@ -22,7 +23,7 @@ class TheaterModeSensorManager : SensorManager { } override fun docsLink(): String { - return "https://companion.home-assistant.io/docs/core/sensors#theater-mode-sensor" + return "https://companion.home-assistant.io/docs/wear-os/#sensors" } override val enabledByDefault: Boolean get() = false @@ -47,7 +48,7 @@ class TheaterModeSensorManager : SensorManager { return val state = try { - Settings.Global.getInt(context.contentResolver, "theater_mode_on") == 1 + Settings.Global.getInt(context.contentResolver, if (Build.MANUFACTURER == "samsung") "setting_theater_mode_on" else "theater_mode_on") == 1 } catch (e: Exception) { Log.e(TAG, "Unable to update theater mode sensor", e) false