Skip to content

Commit 3376339

Browse files
TimoPtrTimoPtr
committed
Apply suggestions
1 parent e4f14f4 commit 3376339

43 files changed

Lines changed: 56 additions & 32 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ io.coil-kt.coil3:coil-network-okhttp:3.5.0=fullDebugAndroidTestCompileClasspath,
488488
io.coil-kt.coil3:coil-svg-android:3.5.0=fullDebugAndroidTestCompileClasspath,fullDebugAndroidTestLintChecksClasspath,fullDebugCompileClasspath,fullDebugLintChecksClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestLintChecksClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestLintChecksClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseLintChecksClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestLintChecksClasspath,fullReleaseScreenshotTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugAndroidTestLintChecksClasspath,minimalDebugCompileClasspath,minimalDebugLintChecksClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestLintChecksClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestLintChecksClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseLintChecksClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestLintChecksClasspath,minimalReleaseScreenshotTestRuntimeClasspath
489489
io.coil-kt.coil3:coil-svg:3.5.0=fullDebugAndroidTestCompileClasspath,fullDebugAndroidTestLintChecksClasspath,fullDebugCompileClasspath,fullDebugLintChecksClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestLintChecksClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestLintChecksClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseLintChecksClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestLintChecksClasspath,fullReleaseScreenshotTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugAndroidTestLintChecksClasspath,minimalDebugCompileClasspath,minimalDebugLintChecksClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestLintChecksClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestLintChecksClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseLintChecksClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestLintChecksClasspath,minimalReleaseScreenshotTestRuntimeClasspath
490490
io.coil-kt.coil3:coil:3.5.0=fullDebugAndroidTestCompileClasspath,fullDebugAndroidTestLintChecksClasspath,fullDebugCompileClasspath,fullDebugLintChecksClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestLintChecksClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestLintChecksClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseLintChecksClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestLintChecksClasspath,fullReleaseScreenshotTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugAndroidTestLintChecksClasspath,minimalDebugCompileClasspath,minimalDebugLintChecksClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestLintChecksClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestLintChecksClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseLintChecksClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestLintChecksClasspath,minimalReleaseScreenshotTestRuntimeClasspath
491-
io.github.classgraph:classgraph:4.8.179=fullDebugUnitTestCompileClasspath,fullDebugUnitTestLintChecksClasspath,fullDebugUnitTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestLintChecksClasspath,minimalDebugUnitTestRuntimeClasspath
491+
io.github.classgraph:classgraph:4.8.184=fullDebugUnitTestCompileClasspath,fullDebugUnitTestLintChecksClasspath,fullDebugUnitTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestLintChecksClasspath,minimalDebugUnitTestRuntimeClasspath
492492
io.github.detekt.sarif4k:sarif4k-jvm:0.6.0=ktlint,ktlintReporter
493493
io.github.detekt.sarif4k:sarif4k:0.6.0=ktlint,ktlintReporter
494494
io.github.oshai:kotlin-logging-jvm:7.0.3=ktlint,ktlintBaselineReporter,ktlintReporter,ktlintRuleset

‎app/src/full/kotlin/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.Manifest
34
import android.app.PendingIntent
45
import android.content.Context
@@ -245,14 +246,7 @@ class ActivitySensorManager @Inject constructor(
245246
Timber.e(e, "Unable to register for activity updates")
246247
}
247248
}
248-
if ((
249-
isEnabled(sleepConfidence) ||
250-
isEnabled(
251-
sleepSegment,
252-
)
253-
) &&
254-
!sleepRegistration
255-
) {
249+
if ((isEnabled(sleepConfidence) || isEnabled(sleepSegment)) && !sleepRegistration) {
256250
val pendingIntent = getSleepPendingIntent(applicationContext)
257251
Timber.d("Registering for sleep updates")
258252
try {

‎app/src/full/kotlin/io/homeassistant/companion/android/sensors/AndroidAutoSensorManager.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.content.Context
34
import android.os.Build
45
import androidx.car.app.connection.CarConnection

‎app/src/full/kotlin/io/homeassistant/companion/android/sensors/LocationSensorManager.kt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.Manifest
34
import android.app.PendingIntent
45
import android.bluetooth.BluetoothAdapter
@@ -195,8 +196,8 @@ class LocationSensorManager @Inject constructor(
195196
}
196197

197198
/**
198-
* Builds an explicit-component [Intent] addressed to this receiver that triggers a single
199-
* accurate location update via [ACTION_REQUEST_ACCURATE_LOCATION_UPDATE].
199+
* Builds an explicit-component [Intent] addressed to [LocationSensorReceiver] that triggers a
200+
* single accurate location update via [ACTION_REQUEST_ACCURATE_LOCATION_UPDATE].
200201
*/
201202
fun createRequestAccurateLocationUpdateIntent(context: Context): Intent = Intent(
202203
context,
@@ -754,7 +755,6 @@ class LocationSensorManager @Inject constructor(
754755
lastLocationReceived[it] = System.currentTimeMillis()
755756
}
756757
LocationResult.extractResult(intent)?.lastLocation?.let { location ->
757-
val sensorRepository = sensorRepository
758758
val sensorSettings = sensorRepository.getSettings(backgroundLocation.id)
759759
val minAccuracy = sensorSettings
760760
.firstOrNull { it.name == SETTING_ACCURACY }?.value?.toIntOrNull()
@@ -874,7 +874,6 @@ class LocationSensorManager @Inject constructor(
874874
}
875875
}
876876

877-
val sensorRepository = sensorRepository
878877
val sensorSettings = sensorRepository.getSettings(zoneLocation.id)
879878
val minAccuracy = sensorSettings
880879
.firstOrNull { it.name == SETTING_ACCURACY }?.value?.toIntOrNull()
@@ -1239,7 +1238,6 @@ class LocationSensorManager @Inject constructor(
12391238
}
12401239

12411240
val now = System.currentTimeMillis()
1242-
val sensorRepository = sensorRepository
12431241
val fullSensor = sensorRepository.getFull(singleAccurateLocation.id).toSensorWithAttributes()
12441242
val latestAccurateLocation =
12451243
fullSensor?.attributes?.firstOrNull { it.name == "lastAccurateLocationRequest" }?.value?.toLongOrNull()
@@ -1410,7 +1408,6 @@ class LocationSensorManager @Inject constructor(
14101408
setupLocationTracking()
14111409
}
14121410
cleanupLocationHistory()
1413-
val sensorRepository = sensorRepository
14141411
val sensorSetting = sensorRepository.getSettings(singleAccurateLocation.id)
14151412
val includeSensorUpdate =
14161413
sensorSetting.firstOrNull { it.name == SETTING_INCLUDE_SENSOR_UPDATE }?.value ?: "false"

‎app/src/main/kotlin/io/homeassistant/companion/android/sensors/CarSensorManager.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.content.Context
34
import android.os.Build
45
import androidx.car.app.hardware.common.CarValue

‎app/src/main/kotlin/io/homeassistant/companion/android/sensors/DevicePolicyManager.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.content.Context
34
import android.content.Intent
45
import dagger.hilt.android.qualifiers.ApplicationContext

‎app/src/main/kotlin/io/homeassistant/companion/android/sensors/DynamicColorSensorManager.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.content.Context
34
import androidx.core.graphics.blue
45
import androidx.core.graphics.green

‎app/src/main/kotlin/io/homeassistant/companion/android/sensors/GeocodeSensorManager.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.Manifest
34
import android.content.Context
45
import android.location.Address
@@ -97,10 +98,10 @@ class GeocodeSensorManager @Inject constructor(
9798
}
9899

99100
override suspend fun requestSensorUpdate() {
100-
updateGeocodedLocation(applicationContext)
101+
updateGeocodedLocation()
101102
}
102103

103-
private suspend fun updateGeocodedLocation(applicationContext: Context) {
104+
private suspend fun updateGeocodedLocation() {
104105
if (!isEnabled(geocodedLocation) || !checkPermission(geocodedLocation.id)) {
105106
return
106107
}
@@ -143,9 +144,7 @@ class GeocodeSensorManager @Inject constructor(
143144
if (!prettyAddress.isNullOrEmpty()) {
144145
prettyAddress
145146
} else {
146-
applicationContext.getString(
147-
commonR.string.unknown_address,
148-
)
147+
applicationContext.getString(commonR.string.unknown_address)
149148
},
150149
)
151150

‎app/src/main/kotlin/io/homeassistant/companion/android/sensors/HealthConnectSensorManager.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.content.Context
34
import android.content.Intent
45
import androidx.activity.result.contract.ActivityResultContract

‎app/src/main/kotlin/io/homeassistant/companion/android/sensors/LastAppSensorManager.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package io.homeassistant.companion.android.sensors
2+
23
import android.Manifest
34
import android.app.usage.UsageStatsManager
45
import android.content.Context

0 commit comments

Comments
 (0)