diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index f1481b831..fc65f7f62 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="228"
+            line="231"
             column="13"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="233"
+            line="236"
             column="17"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                        ^">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="251"
+            line="256"
             column="25"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                        ^">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="259"
+            line="264"
             column="25"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                        ^">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="267"
+            line="272"
             column="25"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="        ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/DataUriDownloadManager.kt"
-            line="69"
+            line="64"
             column="9"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="994"
+            line="1104"
             column="17"/>
     </issue>
 
@@ -140,7 +140,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/util/ForegroundServiceLauncher.kt"
-            line="48"
+            line="52"
             column="33"/>
     </issue>
 
@@ -433,7 +433,7 @@
     <issue
         id="CustomSplashScreen"
         message="The application should not provide its own launch screen"
-        errorLine1="class LaunchActivity : AppCompatActivity(), LaunchView {"
+        errorLine1="class LaunchActivity :"
         errorLine2="      ~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/launch/LaunchActivity.kt"
@@ -470,7 +470,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/sensor/SensorDetailViewModel.kt"
-            line="332"
+            line="337"
             column="38"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/sensors/CarSensorManager.kt"
-            line="262"
+            line="268"
             column="20"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/sensors/CarSensorManager.kt"
-            line="273"
+            line="279"
             column="33"/>
     </issue>
 
@@ -635,7 +635,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/sensors/CarSensorManager.kt"
-            line="303"
+            line="309"
             column="13"/>
     </issue>
 
@@ -646,7 +646,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="500"
+            line="523"
             column="17"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="500"
+            line="523"
             column="17"/>
     </issue>
 
@@ -767,7 +767,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/assist/AssistShortcutViewModel.kt"
-            line="21"
+            line="19"
             column="21"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="116"
+            line="117"
             column="21"/>
     </issue>
 
@@ -1055,19 +1055,19 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/button/ButtonWidget.kt"
-            line="299"
+            line="307"
             column="25"/>
     </issue>
 
     <issue
         id="AvoidAnySerializer"
         message="Prefer polymorphic serializer over AnySerializer."
-        errorLine1="                        val dbMap: Map&lt;String, Any?> = kotlinJsonMapper.decodeFromString(MapAnySerializer, buttonWidget.serviceData)"
-        errorLine2="                                                                                         ~~~~~~~~~~~~~~~~">
+        errorLine1="                            MapAnySerializer,"
+        errorLine2="                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt"
-            line="150"
-            column="90"/>
+            line="157"
+            column="29"/>
     </issue>
 
     <issue
@@ -1077,7 +1077,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt"
-            line="464"
+            line="491"
             column="49"/>
     </issue>
 
@@ -1088,7 +1088,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="156"
+            line="166"
             column="13"/>
     </issue>
 
@@ -1099,7 +1099,7 @@
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/barcode/BarcodeScannerActivity.kt"
-            line="144"
+            line="138"
             column="80"/>
     </issue>
 
@@ -1121,7 +1121,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/settings/sensor/HealthConnectPermissionActivity.kt"
-            line="15"
+            line="18"
             column="40"/>
     </issue>
 
@@ -1132,7 +1132,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/developer/location/views/LocationTrackingView.kt"
-            line="238"
+            line="248"
             column="45"/>
     </issue>
 
@@ -1143,7 +1143,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/vehicle/MapVehicleScreen.kt"
-            line="131"
+            line="134"
             column="33"/>
     </issue>
 
@@ -1154,7 +1154,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1453"
+            line="1539"
             column="16"/>
     </issue>
 
@@ -1165,7 +1165,7 @@
         errorLine2="                                ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1583"
+            line="1669"
             column="33"/>
     </issue>
 
@@ -1176,30 +1176,30 @@
         errorLine2="                                ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1583"
+            line="1669"
             column="33"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                    marketIntent.data = Uri.parse(MARKET_PREFIX + if (uri.startsWith(INTENT_PREFIX)) intent.`package`.toString() else uri.removePrefix(APP_PREFIX))"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        Uri.parse("
+        errorLine2="                        ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1618"
-            column="41"/>
+            line="1706"
+            column="25"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                    marketIntent.data = Uri.parse(MARKET_PREFIX + if (uri.startsWith(INTENT_PREFIX)) intent.`package`.toString() else uri.removePrefix(APP_PREFIX))"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        Uri.parse("
+        errorLine2="                        ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1618"
-            column="41"/>
+            line="1706"
+            column="25"/>
     </issue>
 
     <issue
@@ -1209,7 +1209,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1658"
+            line="1753"
             column="13"/>
     </issue>
 
@@ -1220,7 +1220,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1674"
+            line="1769"
             column="13"/>
     </issue>
 
@@ -1231,7 +1231,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1683"
+            line="1778"
             column="23"/>
     </issue>
 
@@ -1242,7 +1242,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1683"
+            line="1778"
             column="23"/>
     </issue>
 
@@ -1253,7 +1253,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1801"
+            line="1901"
             column="68"/>
     </issue>
 
@@ -1264,7 +1264,7 @@
         errorLine2="                                    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1870"
+            line="1967"
             column="37"/>
     </issue>
 
@@ -1275,7 +1275,7 @@
         errorLine2="                                    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1870"
+            line="1967"
             column="37"/>
     </issue>
 
@@ -1286,7 +1286,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt"
-            line="174"
+            line="171"
             column="21"/>
     </issue>
 
@@ -1297,30 +1297,30 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt"
-            line="201"
+            line="198"
             column="49"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(&quot;https://companion.home-assistant.io/docs/integrations/universal-links&quot;))"
-        errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                                Uri.parse(&quot;https://companion.home-assistant.io/docs/integrations/universal-links&quot;),"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/nfc/views/NfcNavigationView.kt"
-            line="96"
-            column="65"/>
+            line="95"
+            column="33"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                            context.startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse(&quot;package:${context.packageName}&quot;)))"
-        errorLine2="                                                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                                    Uri.parse(&quot;package:${context.packageName}&quot;),"
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/sensor/views/SensorDetailView.kt"
-            line="122"
-            column="104"/>
+            line="126"
+            column="37"/>
     </issue>
 
     <issue
@@ -1330,7 +1330,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="319"
+            line="336"
             column="52"/>
     </issue>
 
@@ -1341,7 +1341,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="319"
+            line="336"
             column="52"/>
     </issue>
 
@@ -1352,7 +1352,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="340"
+            line="357"
             column="52"/>
     </issue>
 
@@ -1363,7 +1363,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="340"
+            line="357"
             column="52"/>
     </issue>
 
@@ -1374,7 +1374,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="533"
+            line="556"
             column="21"/>
     </issue>
 
@@ -1385,7 +1385,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/settings/wear/SettingsWearActivity.kt"
-            line="203"
+            line="209"
             column="22"/>
     </issue>
 
@@ -1396,7 +1396,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearHomeView.kt"
-            line="125"
+            line="121"
             column="61"/>
     </issue>
 
@@ -1407,7 +1407,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt"
-            line="131"
+            line="139"
             column="27"/>
     </issue>
 
@@ -1418,21 +1418,10 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt"
-            line="380"
+            line="411"
             column="13"/>
     </issue>
 
-    <issue
-        id="UseKtx"
-        message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                                        Uri.parse(&quot;package:${activity?.packageName}&quot;),"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/settings/websocket/WebsocketSettingFragment.kt"
-            line="77"
-            column="41"/>
-    </issue>
-
     <issue
         id="ContentDescription"
         message="Missing `contentDescription` attribute on image"
@@ -1462,7 +1451,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt"
-            line="141"
+            line="148"
             column="38"/>
     </issue>
 
@@ -1473,7 +1462,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/widgets/template/TemplateWidgetConfigureActivity.kt"
-            line="97"
+            line="99"
             column="38"/>
     </issue>
 
diff --git a/automotive/lint-baseline.xml b/automotive/lint-baseline.xml
index e14a55465..a62286b4f 100644
--- a/automotive/lint-baseline.xml
+++ b/automotive/lint-baseline.xml
@@ -8,7 +8,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="228"
+            line="231"
             column="13"/>
     </issue>
 
@@ -19,7 +19,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="233"
+            line="236"
             column="17"/>
     </issue>
 
@@ -30,7 +30,7 @@
         errorLine2="                        ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="251"
+            line="256"
             column="25"/>
     </issue>
 
@@ -41,7 +41,7 @@
         errorLine2="                        ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="259"
+            line="264"
             column="25"/>
     </issue>
 
@@ -52,7 +52,7 @@
         errorLine2="                        ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="267"
+            line="272"
             column="25"/>
     </issue>
 
@@ -63,7 +63,7 @@
         errorLine2="        ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/DataUriDownloadManager.kt"
-            line="69"
+            line="64"
             column="9"/>
     </issue>
 
@@ -85,7 +85,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="994"
+            line="1104"
             column="17"/>
     </issue>
 
@@ -151,7 +151,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/ForegroundServiceLauncher.kt"
-            line="48"
+            line="52"
             column="33"/>
     </issue>
 
@@ -338,14 +338,14 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/websocket/WebsocketSettingFragment.kt"
-            line="76"
+            line="75"
             column="50"/>
     </issue>
 
     <issue
         id="CustomSplashScreen"
         message="The application should not provide its own launch screen"
-        errorLine1="class LaunchActivity : AppCompatActivity(), LaunchView {"
+        errorLine1="class LaunchActivity :"
         errorLine2="      ~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/launch/LaunchActivity.kt"
@@ -393,7 +393,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/sensor/SensorDetailViewModel.kt"
-            line="332"
+            line="337"
             column="38"/>
     </issue>
 
@@ -547,7 +547,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="206"
+            line="209"
             column="20"/>
     </issue>
 
@@ -558,7 +558,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt"
-            line="216"
+            line="219"
             column="20"/>
     </issue>
 
@@ -580,7 +580,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/AndroidAutoSensorManager.kt"
-            line="30"
+            line="32"
             column="20"/>
     </issue>
 
@@ -591,7 +591,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/AndroidAutoSensorManager.kt"
-            line="38"
+            line="40"
             column="16"/>
     </issue>
 
@@ -602,7 +602,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/assist/AssistActivity.kt"
-            line="165"
+            line="167"
             column="17"/>
     </issue>
 
@@ -613,7 +613,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/assist/AssistActivity.kt"
-            line="173"
+            line="175"
             column="17"/>
     </issue>
 
@@ -624,7 +624,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt"
-            line="85"
+            line="97"
             column="33"/>
     </issue>
 
@@ -635,7 +635,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt"
-            line="85"
+            line="97"
             column="33"/>
     </issue>
 
@@ -646,7 +646,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/authentication/AuthenticationFragment.kt"
-            line="230"
+            line="244"
             column="29"/>
     </issue>
 
@@ -657,7 +657,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt"
-            line="309"
+            line="332"
             column="21"/>
     </issue>
 
@@ -668,7 +668,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt"
-            line="73"
+            line="74"
             column="21"/>
     </issue>
 
@@ -690,7 +690,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/CarSensorManager.kt"
-            line="262"
+            line="268"
             column="20"/>
     </issue>
 
@@ -701,7 +701,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/CarSensorManager.kt"
-            line="273"
+            line="279"
             column="33"/>
     </issue>
 
@@ -712,7 +712,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/CarSensorManager.kt"
-            line="303"
+            line="309"
             column="13"/>
     </issue>
 
@@ -730,12 +730,12 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/DataUriDownloadManager.kt"
-            line="92"
-            column="17"/>
+            line="87"
+            column="21"/>
     </issue>
 
     <issue
@@ -745,7 +745,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/DataUriDownloadManager.kt"
-            line="144"
+            line="141"
             column="13"/>
     </issue>
 
@@ -778,7 +778,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt"
-            line="90"
+            line="91"
             column="21"/>
     </issue>
 
@@ -789,7 +789,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/FlashlightHelper.kt"
-            line="37"
+            line="35"
             column="21"/>
     </issue>
 
@@ -800,7 +800,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/FlashlightHelper.kt"
-            line="51"
+            line="49"
             column="21"/>
     </issue>
 
@@ -844,7 +844,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/util/vehicle/GridItems.kt"
-            line="201"
+            line="202"
             column="1"/>
     </issue>
 
@@ -877,7 +877,7 @@
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/location/HighAccuracyLocationService.kt"
-            line="151"
+            line="156"
             column="24"/>
     </issue>
 
@@ -888,7 +888,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/HomeAssistantApplication.kt"
-            line="164"
+            line="180"
             column="13"/>
     </issue>
 
@@ -899,7 +899,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/HomeAssistantApplication.kt"
-            line="227"
+            line="243"
             column="13"/>
     </issue>
 
@@ -910,7 +910,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/HomeAssistantApplication.kt"
-            line="237"
+            line="253"
             column="13"/>
     </issue>
 
@@ -921,7 +921,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/HomeAssistantApplication.kt"
-            line="247"
+            line="263"
             column="13"/>
     </issue>
 
@@ -932,7 +932,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/HomeAssistantApplication.kt"
-            line="293"
+            line="309"
             column="13"/>
     </issue>
 
@@ -987,19 +987,19 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/LastAppSensorManager.kt"
-            line="56"
+            line="54"
             column="5"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="                    &quot;vertical_accuracy&quot; to if (Build.VERSION.SDK_INT >= 26) geofencingEvent.triggeringLocation!!.verticalAccuracyMeters.toInt() else 0,"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        if (Build.VERSION.SDK_INT >="
+        errorLine2="                            ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/LocationSensorManager.kt"
-            line="785"
-            column="48"/>
+            line="855"
+            column="29"/>
     </issue>
 
     <issue
@@ -1009,7 +1009,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/LocationSensorManager.kt"
-            line="865"
+            line="951"
             column="40"/>
     </issue>
 
@@ -1020,7 +1020,7 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/sensors/LocationSensorManager.kt"
-            line="1213"
+            line="1346"
             column="14"/>
     </issue>
 
@@ -1031,7 +1031,7 @@
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/log/LogFragment.kt"
-            line="194"
+            line="200"
             column="60"/>
     </issue>
 
@@ -1086,7 +1086,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsSettingsFragment.kt"
-            line="65"
+            line="61"
             column="5"/>
     </issue>
 
@@ -1108,7 +1108,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/views/ManageShortcutsView.kt"
-            line="82"
+            line="79"
             column="1"/>
     </issue>
 
@@ -1119,7 +1119,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/views/ManageShortcutsView.kt"
-            line="321"
+            line="329"
             column="1"/>
     </issue>
 
@@ -1130,7 +1130,7 @@
         errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/views/ManageShortcutsView.kt"
-            line="333"
+            line="341"
             column="1"/>
     </issue>
 
@@ -1148,12 +1148,12 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="    val canPinShortcuts = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp; ShortcutManagerCompat.isRequestPinShortcutSupported(app)"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp; ShortcutManagerCompat.isRequestPinShortcutSupported(app)"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="59"
-            column="27"/>
+            line="60"
+            column="9"/>
     </issue>
 
     <issue
@@ -1163,7 +1163,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="107"
+            line="108"
             column="13"/>
     </issue>
 
@@ -1174,7 +1174,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="171"
+            line="181"
             column="21"/>
     </issue>
 
@@ -1185,7 +1185,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/qs/views/ManageTilesView.kt"
-            line="122"
+            line="119"
             column="21"/>
     </issue>
 
@@ -1214,12 +1214,12 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 &amp;&amp; !packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    override fun appSupportsCommissioning(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 &amp;&amp;"
+        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/matter/MatterManagerImpl.kt"
-            line="21"
-            column="9"/>
+            line="20"
+            column="56"/>
     </issue>
 
     <issue
@@ -1229,7 +1229,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/mediaplayer/MediaPlayerControlsWidgetConfigureActivity.kt"
-            line="75"
+            line="76"
             column="21"/>
     </issue>
 
@@ -1240,7 +1240,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="341"
+            line="354"
             column="37"/>
     </issue>
 
@@ -1251,19 +1251,19 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="475"
+            line="523"
             column="37"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="                            if (command in DeviceCommandData.ENABLE_COMMANDS &amp;&amp; Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {"
-        errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="541"
-            column="81"/>
+            line="601"
+            column="33"/>
     </issue>
 
     <issue
@@ -1273,7 +1273,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="571"
+            line="634"
             column="13"/>
     </issue>
 
@@ -1284,7 +1284,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="582"
+            line="645"
             column="21"/>
     </issue>
 
@@ -1295,7 +1295,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="606"
+            line="676"
             column="21"/>
     </issue>
 
@@ -1306,7 +1306,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="647"
+            line="719"
             column="21"/>
     </issue>
 
@@ -1317,7 +1317,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="699"
+            line="778"
             column="21"/>
     </issue>
 
@@ -1328,7 +1328,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="724"
+            line="808"
             column="21"/>
     </issue>
 
@@ -1339,7 +1339,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="754"
+            line="840"
             column="21"/>
     </issue>
 
@@ -1350,7 +1350,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="765"
+            line="852"
             column="21"/>
     </issue>
 
@@ -1361,7 +1361,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="779"
+            line="871"
             column="21"/>
     </issue>
 
@@ -1372,7 +1372,7 @@
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="797"
+            line="892"
             column="28"/>
     </issue>
 
@@ -1383,7 +1383,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="926"
+            line="1036"
             column="17"/>
     </issue>
 
@@ -1394,7 +1394,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="981"
+            line="1091"
             column="13"/>
     </issue>
 
@@ -1405,7 +1405,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1029"
+            line="1137"
             column="21"/>
     </issue>
 
@@ -1416,7 +1416,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1062"
+            line="1168"
             column="50"/>
     </issue>
 
@@ -1427,7 +1427,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1634"
+            line="1729"
             column="13"/>
     </issue>
 
@@ -1438,7 +1438,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1646"
+            line="1741"
             column="5"/>
     </issue>
 
@@ -1449,7 +1449,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1654"
+            line="1749"
             column="5"/>
     </issue>
 
@@ -1460,7 +1460,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1664"
+            line="1759"
             column="5"/>
     </issue>
 
@@ -1471,7 +1471,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1680"
+            line="1775"
             column="5"/>
     </issue>
 
@@ -1482,7 +1482,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1688"
+            line="1783"
             column="5"/>
     </issue>
 
@@ -1493,29 +1493,29 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1693"
+            line="1788"
             column="5"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="                            COMMAND_WEBVIEW, COMMAND_ACTIVITY, COMMAND_LAUNCH_APP -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {"
-        errorLine2="                                                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                            COMMAND_WEBVIEW, COMMAND_ACTIVITY, COMMAND_LAUNCH_APP -> if (Build.VERSION.SDK_INT >="
+        errorLine2="                                                                                         ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1977"
+            line="2081"
             column="90"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="                            COMMAND_RINGER_MODE, COMMAND_DND, COMMAND_VOLUME_LEVEL -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {"
-        errorLine2="                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                            COMMAND_RINGER_MODE, COMMAND_DND, COMMAND_VOLUME_LEVEL -> if (Build.VERSION.SDK_INT >="
+        errorLine2="                                                                                          ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1980"
+            line="2087"
             column="91"/>
     </issue>
 
@@ -1526,7 +1526,7 @@
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1983"
+            line="2093"
             column="50"/>
     </issue>
 
@@ -1537,7 +1537,7 @@
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1997"
+            line="2112"
             column="37"/>
     </issue>
 
@@ -1548,7 +1548,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt"
-            line="181"
+            line="178"
             column="16"/>
     </issue>
 
@@ -1581,7 +1581,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/NotificationSensorManager.kt"
-            line="159"
+            line="161"
             column="17"/>
     </issue>
 
@@ -1592,7 +1592,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/NotificationSensorManager.kt"
-            line="221"
+            line="223"
             column="17"/>
     </issue>
 
@@ -1603,7 +1603,7 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/sensors/NotificationSensorManager.kt"
-            line="260"
+            line="268"
             column="29"/>
     </issue>
 
@@ -1665,11 +1665,11 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &amp;&amp; requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)"
+        errorLine1="            Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &amp;&amp;"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="184"
+            line="187"
             column="13"/>
     </issue>
 
@@ -1680,7 +1680,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="198"
+            line="202"
             column="17"/>
     </issue>
 
@@ -1691,7 +1691,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="211"
+            line="215"
             column="17"/>
     </issue>
 
@@ -1702,7 +1702,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="244"
+            line="248"
             column="13"/>
     </issue>
 
@@ -1713,29 +1713,29 @@
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="282"
+            line="286"
             column="29"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp; (BuildConfig.FLAVOR == &quot;full&quot; || isAutomotive)"
+        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp;"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="353"
+            line="370"
             column="17"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp; (BuildConfig.FLAVOR == &quot;full&quot; || isAutomotive)"
+        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp;"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="353"
+            line="370"
             column="17"/>
     </issue>
 
@@ -1746,7 +1746,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="385"
+            line="403"
             column="13"/>
     </issue>
 
@@ -1757,7 +1757,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="490"
+            line="513"
             column="13"/>
     </issue>
 
@@ -1768,7 +1768,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="500"
+            line="523"
             column="17"/>
     </issue>
 
@@ -1779,7 +1779,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="500"
+            line="523"
             column="17"/>
     </issue>
 
@@ -1790,7 +1790,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="540"
+            line="563"
             column="13"/>
     </issue>
 
@@ -1801,7 +1801,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="550"
+            line="573"
             column="16"/>
     </issue>
 
@@ -1812,7 +1812,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt"
-            line="269"
+            line="274"
             column="13"/>
     </issue>
 
@@ -1823,7 +1823,7 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt"
-            line="273"
+            line="278"
             column="43"/>
     </issue>
 
@@ -1834,18 +1834,18 @@
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt"
-            line="276"
+            line="282"
             column="43"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp; !NotificationManagerCompat.from(context).areNotificationsEnabled()) {"
+        errorLine1="        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp;"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt"
-            line="292"
+            line="298"
             column="13"/>
     </issue>
 
@@ -1856,7 +1856,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/ssid/SsidFragment.kt"
-            line="87"
+            line="83"
             column="38"/>
     </issue>
 
@@ -1867,7 +1867,7 @@
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/ssid/SsidFragment.kt"
-            line="96"
+            line="92"
             column="53"/>
     </issue>
 
@@ -1878,7 +1878,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/ssid/SsidFragment.kt"
-            line="135"
+            line="133"
             column="20"/>
     </issue>
 
@@ -1922,7 +1922,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/template/TemplateWidgetConfigureActivity.kt"
-            line="136"
+            line="143"
             column="21"/>
     </issue>
 
@@ -1933,19 +1933,19 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/themes/ThemesManager.kt"
-            line="22"
+            line="20"
             column="38"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 &amp;&amp; !packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="    override fun appSupportsThread(): Boolean = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 &amp;&amp;"
+        errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/thread/ThreadManagerImpl.kt"
-            line="36"
-            column="9"/>
+            line="35"
+            column="49"/>
     </issue>
 
     <issue
@@ -2406,7 +2406,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/qs/TileExtensions.kt"
-            line="147"
+            line="149"
             column="21"/>
     </issue>
 
@@ -2417,7 +2417,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/qs/TileExtensions.kt"
-            line="194"
+            line="196"
             column="21"/>
     </issue>
 
@@ -2428,7 +2428,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/qs/TileExtensions.kt"
-            line="217"
+            line="215"
             column="21"/>
     </issue>
 
@@ -2439,7 +2439,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/qs/TileExtensions.kt"
-            line="284"
+            line="282"
             column="17"/>
     </issue>
 
@@ -2461,7 +2461,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="242"
+            line="248"
             column="13"/>
     </issue>
 
@@ -2472,7 +2472,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="494"
+            line="495"
             column="21"/>
     </issue>
 
@@ -2483,7 +2483,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="495"
+            line="496"
             column="21"/>
     </issue>
 
@@ -2494,7 +2494,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="530"
+            line="526"
             column="25"/>
     </issue>
 
@@ -2505,7 +2505,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="530"
+            line="526"
             column="25"/>
     </issue>
 
@@ -2516,7 +2516,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="623"
+            line="619"
             column="13"/>
     </issue>
 
@@ -2527,7 +2527,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="1095"
+            line="1147"
             column="21"/>
     </issue>
 
@@ -2538,7 +2538,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewActivity.kt"
-            line="1208"
+            line="1260"
             column="17"/>
     </issue>
 
@@ -2549,7 +2549,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/websocket/WebsocketManager.kt"
-            line="217"
+            line="223"
             column="13"/>
     </issue>
 
@@ -2560,7 +2560,7 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/websocket/WebsocketManager.kt"
-            line="273"
+            line="279"
             column="17"/>
     </issue>
 
@@ -2571,7 +2571,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/websocket/WebsocketSettingFragment.kt"
-            line="73"
+            line="72"
             column="33"/>
     </issue>
 
@@ -2582,19 +2582,19 @@
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/websocket/WebsocketSettingFragment.kt"
-            line="99"
+            line="98"
             column="42"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="            if (websocketSetting != WebsocketSetting.NEVER &amp;&amp; Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp; uiManager?.currentModeType != Configuration.UI_MODE_TYPE_TELEVISION) {"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &amp;&amp;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/websocket/views/WebsocketSettingView.kt"
-            line="82"
-            column="63"/>
+            line="115"
+            column="17"/>
     </issue>
 
     <issue
@@ -2604,7 +2604,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/welcome/WelcomeFragment.kt"
-            line="34"
+            line="30"
             column="13"/>
     </issue>
 
@@ -2738,7 +2738,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/assist/AssistShortcutViewModel.kt"
-            line="21"
+            line="19"
             column="21"/>
     </issue>
 
@@ -2749,7 +2749,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="116"
+            line="117"
             column="21"/>
     </issue>
 
@@ -3026,19 +3026,19 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/button/ButtonWidget.kt"
-            line="299"
+            line="307"
             column="25"/>
     </issue>
 
     <issue
         id="AvoidAnySerializer"
         message="Prefer polymorphic serializer over AnySerializer."
-        errorLine1="                        val dbMap: Map&lt;String, Any?> = kotlinJsonMapper.decodeFromString(MapAnySerializer, buttonWidget.serviceData)"
-        errorLine2="                                                                                         ~~~~~~~~~~~~~~~~">
+        errorLine1="                            MapAnySerializer,"
+        errorLine2="                            ~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt"
-            line="150"
-            column="90"/>
+            line="157"
+            column="29"/>
     </issue>
 
     <issue
@@ -3048,7 +3048,7 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt"
-            line="464"
+            line="491"
             column="49"/>
     </issue>
 
@@ -3059,7 +3059,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/shortcuts/ManageShortcutsViewModel.kt"
-            line="156"
+            line="166"
             column="13"/>
     </issue>
 
@@ -3070,7 +3070,7 @@
         errorLine2="                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/barcode/BarcodeScannerActivity.kt"
-            line="144"
+            line="138"
             column="80"/>
     </issue>
 
@@ -3092,7 +3092,7 @@
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/settings/sensor/HealthConnectPermissionActivity.kt"
-            line="15"
+            line="18"
             column="40"/>
     </issue>
 
@@ -3103,7 +3103,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/developer/location/views/LocationTrackingView.kt"
-            line="238"
+            line="248"
             column="45"/>
     </issue>
 
@@ -3114,7 +3114,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/vehicle/MapVehicleScreen.kt"
-            line="131"
+            line="134"
             column="33"/>
     </issue>
 
@@ -3125,7 +3125,7 @@
         errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1453"
+            line="1539"
             column="16"/>
     </issue>
 
@@ -3136,7 +3136,7 @@
         errorLine2="                                ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1583"
+            line="1669"
             column="33"/>
     </issue>
 
@@ -3147,30 +3147,30 @@
         errorLine2="                                ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1583"
+            line="1669"
             column="33"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                    marketIntent.data = Uri.parse(MARKET_PREFIX + if (uri.startsWith(INTENT_PREFIX)) intent.`package`.toString() else uri.removePrefix(APP_PREFIX))"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        Uri.parse("
+        errorLine2="                        ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1618"
-            column="41"/>
+            line="1706"
+            column="25"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                    marketIntent.data = Uri.parse(MARKET_PREFIX + if (uri.startsWith(INTENT_PREFIX)) intent.`package`.toString() else uri.removePrefix(APP_PREFIX))"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                        Uri.parse("
+        errorLine2="                        ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1618"
-            column="41"/>
+            line="1706"
+            column="25"/>
     </issue>
 
     <issue
@@ -3180,7 +3180,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1658"
+            line="1753"
             column="13"/>
     </issue>
 
@@ -3191,7 +3191,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1674"
+            line="1769"
             column="13"/>
     </issue>
 
@@ -3202,7 +3202,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1683"
+            line="1778"
             column="23"/>
     </issue>
 
@@ -3213,7 +3213,7 @@
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1683"
+            line="1778"
             column="23"/>
     </issue>
 
@@ -3224,7 +3224,7 @@
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1801"
+            line="1901"
             column="68"/>
     </issue>
 
@@ -3235,7 +3235,7 @@
         errorLine2="                                    ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1870"
+            line="1967"
             column="37"/>
     </issue>
 
@@ -3246,7 +3246,7 @@
         errorLine2="                                    ^">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/notifications/MessagingManager.kt"
-            line="1870"
+            line="1967"
             column="37"/>
     </issue>
 
@@ -3257,7 +3257,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt"
-            line="174"
+            line="171"
             column="21"/>
     </issue>
 
@@ -3268,30 +3268,30 @@
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/onboarding/integration/MobileAppIntegrationFragment.kt"
-            line="201"
+            line="198"
             column="49"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(&quot;https://companion.home-assistant.io/docs/integrations/universal-links&quot;))"
-        errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                                Uri.parse(&quot;https://companion.home-assistant.io/docs/integrations/universal-links&quot;),"
+        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/nfc/views/NfcNavigationView.kt"
-            line="96"
-            column="65"/>
+            line="95"
+            column="33"/>
     </issue>
 
     <issue
         id="UseKtx"
         message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                            context.startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse(&quot;package:${context.packageName}&quot;)))"
-        errorLine2="                                                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                                    Uri.parse(&quot;package:${context.packageName}&quot;),"
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/sensor/views/SensorDetailView.kt"
-            line="122"
-            column="104"/>
+            line="126"
+            column="37"/>
     </issue>
 
     <issue
@@ -3301,7 +3301,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="319"
+            line="336"
             column="52"/>
     </issue>
 
@@ -3312,7 +3312,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="319"
+            line="336"
             column="52"/>
     </issue>
 
@@ -3323,7 +3323,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="340"
+            line="357"
             column="52"/>
     </issue>
 
@@ -3334,7 +3334,7 @@
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="340"
+            line="357"
             column="52"/>
     </issue>
 
@@ -3345,7 +3345,7 @@
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/SettingsFragment.kt"
-            line="533"
+            line="556"
             column="21"/>
     </issue>
 
@@ -3356,7 +3356,7 @@
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/settings/wear/SettingsWearActivity.kt"
-            line="203"
+            line="209"
             column="22"/>
     </issue>
 
@@ -3367,7 +3367,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*7}/io/homeassistant/companion/android/settings/wear/views/SettingsWearHomeView.kt"
-            line="125"
+            line="121"
             column="61"/>
     </issue>
 
@@ -3378,7 +3378,7 @@
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt"
-            line="131"
+            line="139"
             column="27"/>
     </issue>
 
@@ -3389,21 +3389,10 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt"
-            line="380"
+            line="411"
             column="13"/>
     </issue>
 
-    <issue
-        id="UseKtx"
-        message="Use the KTX extension function `String.toUri` instead?"
-        errorLine1="                                        Uri.parse(&quot;package:${activity?.packageName}&quot;),"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/settings/websocket/WebsocketSettingFragment.kt"
-            line="77"
-            column="41"/>
-    </issue>
-
     <issue
         id="ContentDescription"
         message="Missing `contentDescription` attribute on image"
@@ -3433,7 +3422,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt"
-            line="141"
+            line="148"
             column="38"/>
     </issue>
 
@@ -3444,7 +3433,7 @@
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="${:automotive*fullDebug*MAIN*sourceProvider*0*javaDir*5}/io/homeassistant/companion/android/widgets/template/TemplateWidgetConfigureActivity.kt"
-            line="97"
+            line="99"
             column="38"/>
     </issue>
 
diff --git a/common/lint-baseline.xml b/common/lint-baseline.xml
index 14b864031..ed691c04e 100644
--- a/common/lint-baseline.xml
+++ b/common/lint-baseline.xml
@@ -3,7 +3,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Insert"
         errorLine2="    ^">
         <location
@@ -14,7 +14,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Update"
         errorLine2="    ^">
         <location
@@ -25,7 +25,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * from authentication_list WHERE Host = :key&quot;)"
         errorLine2="    ^">
         <location
@@ -36,7 +36,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM button_widgets WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -47,7 +47,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;DELETE FROM camera_tiles where id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -58,7 +58,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM camera_widgets WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -69,7 +69,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM favorite_cache where id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -80,7 +80,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM favorite_cache ORDER BY id ASC&quot;)"
         errorLine2="    ^">
         <location
@@ -91,7 +91,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
         errorLine2="    ^">
         <location
@@ -102,7 +102,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;DELETE FROM favorite_cache where id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -113,7 +113,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;DELETE FROM favorite_cache&quot;)"
         errorLine2="    ^">
         <location
@@ -124,40 +124,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt"
-            line="12"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Query(&quot;SELECT * FROM location_history ORDER BY id DESC&quot;)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt"
-            line="15"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Query(&quot;SELECT * FROM location_history WHERE result IN (:results) ORDER BY id DESC&quot;)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt"
-            line="18"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM media_player_controls_widgets WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -168,7 +135,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
         errorLine2="    ^">
         <location
@@ -179,7 +146,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM notification_history WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -190,7 +157,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM notification_history ORDER BY received DESC&quot;)"
         errorLine2="    ^">
         <location
@@ -201,7 +168,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM notification_history ORDER BY received DESC LIMIT (:amount)&quot;)"
         errorLine2="    ^">
         <location
@@ -212,7 +179,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM Sensors WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -223,7 +190,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM Sensors WHERE id = :id AND server_id = :serverId&quot;)"
         errorLine2="    ^">
         <location
@@ -234,7 +201,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Transaction"
         errorLine2="    ^">
         <location
@@ -245,53 +212,31 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Transaction"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="30"
+            line="32"
             column="5"/>
     </issue>
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Transaction"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="44"
+            line="50"
             column="5"/>
     </issue>
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Insert(onConflict = OnConflictStrategy.IGNORE)"
         errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="52"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="55"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
-        errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
             line="58"
@@ -300,7 +245,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
         errorLine2="    ^">
         <location
@@ -311,31 +256,31 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
+        errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
+        errorLine2="    ^">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
+            line="64"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="CoroutineDaoFunction"
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
+        errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
+        errorLine2="    ^">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
+            line="67"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="CoroutineDaoFunction"
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;DELETE FROM sensor_settings WHERE sensor_id = :sensorId AND name = :settingName&quot;)"
         errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="81"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Query(&quot;DELETE FROM sensor_settings WHERE sensor_id = :sensorId AND name IN (:settingNames)&quot;)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="84"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Update"
-        errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
             line="87"
@@ -344,8 +289,8 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Query(&quot;DELETE FROM sensor_attributes WHERE sensor_id = :sensorId&quot;)"
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
+        errorLine1="    @Query(&quot;DELETE FROM sensor_settings WHERE sensor_id = :sensorId AND name IN (:settingNames)&quot;)"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
@@ -355,8 +300,8 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Transaction"
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
+        errorLine1="    @Update"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
@@ -366,40 +311,62 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
+        errorLine1="    @Query(&quot;DELETE FROM sensor_attributes WHERE sensor_id = :sensorId&quot;)"
+        errorLine2="    ^">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
+            line="96"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="CoroutineDaoFunction"
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
+        errorLine1="    @Transaction"
+        errorLine2="    ^">
+        <location
+            file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
+            line="99"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="CoroutineDaoFunction"
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;UPDATE sensor_settings SET value = :value WHERE sensor_id = :sensorId AND name = :settingName&quot;)"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="102"
+            line="108"
             column="5"/>
     </issue>
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Transaction"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="137"
+            line="145"
             column="5"/>
     </issue>
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Transaction"
         errorLine2="    ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/sensor/SensorDao.kt"
-            line="150"
+            line="158"
             column="5"/>
     </issue>
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM servers WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -410,7 +377,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM servers WHERE webhook_id = :webhookId&quot;)"
         errorLine2="    ^">
         <location
@@ -421,7 +388,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM servers ORDER BY `list_order` ASC&quot;)"
         errorLine2="    ^">
         <location
@@ -432,40 +399,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Insert(onConflict = OnConflictStrategy.REPLACE)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/settings/SettingsDao.kt"
-            line="13"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Query(&quot;SELECT * FROM settings WHERE id = :id&quot;)"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/settings/SettingsDao.kt"
-            line="16"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
-        errorLine1="    @Update"
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/io/homeassistant/companion/android/database/settings/SettingsDao.kt"
-            line="22"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM static_widget WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -476,7 +410,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;SELECT * FROM template_widgets WHERE id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -487,7 +421,7 @@
 
     <issue
         id="CoroutineDaoFunction"
-        message="DAO functions should suspend or return a Flow."
+        message="DAO functions should suspend, return a Flow, or return a PagingSource."
         errorLine1="    @Query(&quot;DELETE FROM thermostat_tiles where id = :id&quot;)"
         errorLine2="    ^">
         <location
@@ -503,18 +437,18 @@
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/database/AppDatabase.kt"
-            line="932"
+            line="1034"
             column="17"/>
     </issue>
 
     <issue
         id="MissingPermission"
         message="Missing permissions required by NotificationManagerCompat.notify: android.permission.POST_NOTIFICATIONS"
-        errorLine1="                NotificationManagerCompat.from(context).notify(DISABLED_LOCATION_WARN_ID, DISABLED_LOCATION_WARN_ID.hashCode(), notificationBuilder.build())"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                NotificationManagerCompat.from("
+        errorLine2="                ^">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/util/DisabledLocationHandler.kt"
-            line="112"
+            line="139"
             column="17"/>
     </issue>
 
@@ -536,7 +470,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/SensorReceiverBase.kt"
-            line="385"
+            line="398"
             column="9"/>
     </issue>
 
@@ -613,7 +547,7 @@
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/BluetoothSensorManager.kt"
-            line="150"
+            line="178"
             column="47"/>
     </issue>
 
@@ -624,7 +558,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/BluetoothSensorManager.kt"
-            line="156"
+            line="185"
             column="46"/>
     </issue>
 
@@ -635,7 +569,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/BluetoothSensorManager.kt"
-            line="164"
+            line="194"
             column="46"/>
     </issue>
 
@@ -646,7 +580,7 @@
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/BluetoothSensorManager.kt"
-            line="173"
+            line="204"
             column="46"/>
     </issue>
 
@@ -675,23 +609,23 @@
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 29"
-        errorLine1="            (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &amp;&amp; context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)) ->"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &amp;&amp;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/PhoneStateSensorManager.kt"
-            line="129"
-            column="14"/>
+            line="130"
+            column="17"/>
     </issue>
 
     <issue
         id="ObsoleteSdkInt"
         message="Unnecessary; `SDK_INT` is always >= 24"
-        errorLine1="            (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &amp;&amp; context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)) ->"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="                Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &amp;&amp;"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/PhoneStateSensorManager.kt"
-            line="131"
-            column="14"/>
+            line="143"
+            column="17"/>
     </issue>
 
     <issue
@@ -778,7 +712,7 @@
         errorLine2="                                                            ~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/sensors/SensorManager.kt"
-            line="295"
+            line="312"
             column="61"/>
     </issue>
 
@@ -789,19 +723,19 @@
         errorLine2="                                                                ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/data/websocket/impl/WebSocketCoreImpl.kt"
-            line="227"
+            line="233"
             column="65"/>
     </issue>
 
     <issue
         id="AvoidAnySerializer"
         message="Prefer polymorphic serializer over AnySerializer."
-        errorLine1="                                val result = connection?.send(kotlinJsonMapper.encodeToString(MapAnySerializer, outbound))"
-        errorLine2="                                                                                              ~~~~~~~~~~~~~~~~">
+        errorLine1="                                    kotlinJsonMapper.encodeToString(MapAnySerializer, outbound),"
+        errorLine2="                                                                    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/data/websocket/impl/WebSocketCoreImpl.kt"
-            line="266"
-            column="95"/>
+            line="273"
+            column="69"/>
     </issue>
 
     <issue
@@ -877,7 +811,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/LocalStorageImpl.kt"
-            line="64"
+            line="63"
             column="9"/>
     </issue>
 
@@ -888,7 +822,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/LocalStorageImpl.kt"
-            line="72"
+            line="71"
             column="9"/>
     </issue>
 
@@ -899,7 +833,7 @@
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/io/homeassistant/companion/android/common/notifications/NotificationFunctions.kt"
-            line="204"
+            line="184"
             column="20"/>
     </issue>
 
diff --git a/common/src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt b/common/src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt
index 77dc06f9a..77d81b15e 100644
--- a/common/src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt
+++ b/common/src/main/kotlin/io/homeassistant/companion/android/database/location/LocationHistoryDao.kt
@@ -10,7 +10,7 @@ import androidx.room.Query
 interface LocationHistoryDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun add(item: LocationHistoryItem): Long
+    suspend fun add(item: LocationHistoryItem): Long
 
     @Query("SELECT * FROM location_history ORDER BY id DESC")
     fun getAll(): PagingSource<Int, LocationHistoryItem>
diff --git a/lint/src/main/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssue.kt b/lint/src/main/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssue.kt
index b3a886f0f..f9f99437c 100644
--- a/lint/src/main/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssue.kt
+++ b/lint/src/main/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssue.kt
@@ -19,9 +19,9 @@ object CoroutineDaoFunctionsIssue {
     @JvmField
     val ISSUE = Issue.Companion.create(
         id = "CoroutineDaoFunction",
-        briefDescription = "DAO functions should suspend or return a Flow",
-        explanation = """All functions in a DAO should suspend or return a Flow to ensure 
-            |they can be executed properly in coroutines
+        briefDescription = "DAO functions should suspend, return a Flow, or return a PagingSource",
+        explanation = """All functions in a DAO should suspend, return a Flow, or return a PagingSource 
+            |to ensure they can be executed properly in coroutines
         """.trimMargin(),
         category = Category.Companion.CORRECTNESS,
         severity = Severity.ERROR,
@@ -50,12 +50,12 @@ object CoroutineDaoFunctionsIssue {
         }
 
         private fun checkMethod(context: JavaContext, method: UMethod) {
-            if (!method.isSuspend() && !method.isReturningFlow()) {
+            if (!method.isSuspend() && !method.isReturningFlow() && !method.isPagingSource()) {
                 context.report(
                     ISSUE,
                     method,
                     context.getLocation(method),
-                    "DAO functions should suspend or return a Flow.",
+                    "DAO functions should suspend, return a Flow, or return a PagingSource.",
                 )
             }
         }
@@ -73,3 +73,6 @@ private fun UMethod.isSuspend(): Boolean {
 private fun UMethod.isReturningFlow(): Boolean {
     return returnType?.canonicalText?.startsWith("kotlinx.coroutines.flow.Flow") == true
 }
+private fun UMethod.isPagingSource(): Boolean {
+    return returnType?.canonicalText?.startsWith("androidx.paging.PagingSource") == true
+}
diff --git a/lint/src/test/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssueTest.kt b/lint/src/test/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssueTest.kt
index d7c7df87d..6d4016f99 100644
--- a/lint/src/test/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssueTest.kt
+++ b/lint/src/test/kotlin/io/homeassistant/lint/room/CoroutineDaoFunctionsIssueTest.kt
@@ -22,6 +22,14 @@ class CoroutineDaoFunctionsIssueTest {
         """,
     ).indented()
 
+    private val pagingSource = kotlin(
+        """
+        package androidx.paging
+        
+        interface PagingSource<K, V>
+        """,
+    ).indented()
+
     @Test
     fun `Given a DAO when function is not suspending and does not return a Flow then CoroutineDaoFunction issue is raised`() {
         lint().issues(CoroutineDaoFunctionsIssue.ISSUE)
@@ -43,7 +51,7 @@ class CoroutineDaoFunctionsIssueTest {
             )
             .run()
             .expect(
-                """src/io/homeassistan/companion/android/TestDao.kt:7: Error: DAO functions should suspend or return a Flow. [CoroutineDaoFunction]
+                """src/io/homeassistan/companion/android/TestDao.kt:7: Error: DAO functions should suspend, return a Flow, or return a PagingSource. [CoroutineDaoFunction]
     fun test()
     ~~~~~~~~~~
 1 error""",
@@ -97,4 +105,29 @@ class CoroutineDaoFunctionsIssueTest {
             .run()
             .expectClean()
     }
+
+    @Test
+    fun `Given a DAO when function is not suspending and does return a PagingSource then no issues`() {
+        lint().issues(CoroutineDaoFunctionsIssue.ISSUE)
+            .allowMissingSdk()
+            .files(
+                pagingSource,
+                flow,
+                kotlin(
+                    """
+              package io.homeassistan.companion.android
+                
+              import androidx.paging.PagingSource
+              import kotlinx.coroutines.flow.Flow
+               
+              @Dao
+              interface TestDao {
+                  fun test(): PagingSource<Int, String>
+              }
+                    """,
+                ).indented(),
+            )
+            .run()
+            .expectClean()
+    }
 }