Bump org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0 (home-assist…

…ant#3334) * Bump org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0 Bumps org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0. --- updated-dependencies: - dependency-name: org.jlleitschuh.gradle.ktlint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * gradlew ktlintFormat * Rename packages with underscores > Task :app:ktlintMainSourceSetFormat FAILED home-assistant-android\app\src\main\java\io\homeassistant\companion\android\widgets\media_player_controls\MediaPlayerControlsWidget.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) home-assistant-android\app\src\main\java\io\homeassistant\companion\android\widgets\media_player_controls\MediaPlayerControlsWidgetConfigureActivity.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) Rename: media_player_controls to mediaplayer > Task :wear:ktlintMainSourceSetFormat FAILED home-assistant-android\wear\src\main\java\io\homeassistant\companion\android\onboarding\manual_setup\ManualSetupActivity.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) home-assistant-android\wear\src\main\java\io\homeassistant\companion\android\onboarding\manual_setup\ManualSetupModule.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) home-assistant-android\wear\src\main\java\io\homeassistant\companion\android\onboarding\manual_setup\ManualSetupPresenter.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) home-assistant-android\wear\src\main\java\io\homeassistant\companion\android\onboarding\manual_setup\ManualSetupPresenterImpl.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) home-assistant-android\wear\src\main\java\io\homeassistant\companion\android\onboarding\manual_setup\ManualSetupView.kt:1:1 Package name must not contain underscore (cannot be auto-corrected) Rename: manual_setup to manual --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joris Pelgröm <[email protected]>
anyuta1166 · Mar 1, 2023 · a2f85ef · a2f85ef
1 parent 0c4c32e
commit a2f85ef
Show file tree

Hide file tree

Showing 215 changed files with 1,609 additions and 914 deletions.
diff --git a/app/src/full/java/io/homeassistant/companion/android/CrashHandling.kt b/app/src/full/java/io/homeassistant/companion/android/CrashHandling.kt
@@ -23,8 +23,9 @@ private const val FATAL_CRASH_FILE = "/fatalcrash/last_crash"
 
 fun initCrashReporting(context: Context, enabled: Boolean) {
     // Don't init on debug builds or when disabled
-    if (!shouldEnableCrashHandling(enabled))
+    if (!shouldEnableCrashHandling(enabled)) {
         return
+    }
 
     SentryAndroid.init(context) { options ->
         options.isEnableAutoSessionTracking = true
@@ -66,8 +67,9 @@ fun initCrashReporting(context: Context, enabled: Boolean) {
 }
 
 suspend fun getLatestFatalCrash(context: Context, enabled: Boolean): String? = withContext(Dispatchers.IO) {
-    if (!shouldEnableCrashHandling(enabled))
+    if (!shouldEnableCrashHandling(enabled)) {
         return@withContext null
+    }
 
     var toReturn: String? = null
     try {

diff --git a/app/src/full/java/io/homeassistant/companion/android/location/HighAccuracyLocationService.kt b/app/src/full/java/io/homeassistant/companion/android/location/HighAccuracyLocationService.kt
@@ -51,7 +51,6 @@ class HighAccuracyLocationService : Service() {
 
         @Synchronized
         fun stopService(context: Context) {
-
             Log.d(TAG, "Try stopping high accuracy location service...")
             LAUNCHER.stopService(context)
         }

diff --git a/app/src/full/java/io/homeassistant/companion/android/matter/MatterCommissioningViewModel.kt b/app/src/full/java/io/homeassistant/companion/android/matter/MatterCommissioningViewModel.kt
@@ -74,8 +74,11 @@ class MatterCommissioningViewModel @Inject constructor(
 
             val coreSupport = matterManager.coreSupportsCommissioning(id)
             step =
-                if (coreSupport) CommissioningFlowStep.Confirmation
-                else CommissioningFlowStep.NotSupported
+                if (coreSupport) {
+                    CommissioningFlowStep.Confirmation
+                } else {
+                    CommissioningFlowStep.NotSupported
+                }
         }
     }
 
@@ -101,8 +104,11 @@ class MatterCommissioningViewModel @Inject constructor(
 
             val result = matterManager.commissionDevice(code, serverId)
             step =
-                if (result?.success == true) CommissioningFlowStep.Success
-                else CommissioningFlowStep.Failure(result?.errorCode)
+                if (result?.success == true) {
+                    CommissioningFlowStep.Success
+                } else {
+                    CommissioningFlowStep.Failure(result?.errorCode)
+                }
         }
     }
 }
diff --git a/app/src/full/java/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/ActivitySensorManager.kt
@@ -64,7 +64,6 @@ class ActivitySensorManager : BroadcastReceiver(), SensorManager {
     }
 
     override fun onReceive(context: Context, intent: Intent) {
-
         when (intent.action) {
             ACTION_UPDATE_ACTIVITY -> handleActivityUpdate(intent, context)
             ACTION_SLEEP_ACTIVITY -> handleSleepUpdate(intent, context)
@@ -100,8 +99,9 @@ class ActivitySensorManager : BroadcastReceiver(), SensorManager {
             val result = ActivityRecognitionResult.extractResult(intent)
             var probActivity = result?.let { typeToString(it.mostProbableActivity) }
 
-            if (probActivity == "on_foot")
+            if (probActivity == "on_foot") {
                 probActivity = result?.let { getSubActivity(it) }
+            }
 
             if (probActivity != null && result != null) {
                 onSensorUpdated(
@@ -274,7 +274,6 @@ class ActivitySensorManager : BroadcastReceiver(), SensorManager {
     }
 
     private fun getSensorIcon(activity: String): String {
-
         return when (activity) {
             "in_vehicle" -> "mdi:car"
             "on_bicycle" -> "mdi:bike"

diff --git a/app/src/full/java/io/homeassistant/companion/android/sensors/AndroidAutoSensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/AndroidAutoSensorManager.kt
@@ -31,10 +31,11 @@ class AndroidAutoSensorManager : SensorManager, Observer<Int> {
         get() = commonR.string.sensor_name_android_auto
 
     override suspend fun getAvailableSensors(context: Context): List<SensorManager.BasicSensor> {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             listOf(androidAutoConnected)
-        else
+        } else {
             emptyList()
+        }
     }
 
     override fun requiredPermissions(sensorId: String): Array<String> {
@@ -85,7 +86,7 @@ class AndroidAutoSensorManager : SensorManager, Observer<Int> {
             androidAutoConnected.statelessIcon,
             mapOf(
                 "connection_type" to typeString
-            ),
+            )
         )
     }
 }
diff --git a/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt b/app/src/full/java/io/homeassistant/companion/android/sensors/LocationSensorManager.kt
@@ -199,8 +199,11 @@ class LocationSensorManager : LocationSensorManagerBase() {
                 when (command) {
                     DeviceCommandData.TURN_ON, DeviceCommandData.TURN_OFF, MessagingManager.FORCE_ON -> {
                         var turnOn = command != DeviceCommandData.TURN_OFF
-                        if (turnOn) Log.d(TAG, "Forcing of high accuracy mode enabled")
-                        else Log.d(TAG, "Forcing of high accuracy mode disabled")
+                        if (turnOn) {
+                            Log.d(TAG, "Forcing of high accuracy mode enabled")
+                        } else {
+                            Log.d(TAG, "Forcing of high accuracy mode disabled")
+                        }
                         forceHighAccuracyModeOn = turnOn
                         forceHighAccuracyModeOff = false
                         setHighAccuracyModeSetting(latestContext, turnOn)
@@ -219,8 +222,9 @@ class LocationSensorManager : LocationSensorManagerBase() {
                     }
 
                     MessagingManager.HIGH_ACCURACY_SET_UPDATE_INTERVAL -> {
-                        if (lastHighAccuracyMode)
+                        if (lastHighAccuracyMode) {
                             restartHighAccuracyService(getHighAccuracyModeIntervalSetting(latestContext))
+                        }
                     }
                 }
             }
@@ -311,7 +315,6 @@ class LocationSensorManager : LocationSensorManagerBase() {
                 if (highAccuracyModeEnabled != lastHighAccuracyMode ||
                     updateIntervalHighAccuracySeconds != lastHighAccuracyUpdateInterval
                 ) {
-
                     if (highAccuracyModeEnabled) {
                         Log.d(TAG, "High accuracy mode parameters changed. Enable high accuracy mode.")
                         if (updateIntervalHighAccuracySeconds != lastHighAccuracyUpdateInterval) {
@@ -416,7 +419,6 @@ class LocationSensorManager : LocationSensorManagerBase() {
     }
 
     private fun getHighAccuracyModeState(): Boolean {
-
         var highAccuracyMode = getHighAccuracyModeSetting()
 
         if (!highAccuracyMode) return false
@@ -447,7 +449,6 @@ class LocationSensorManager : LocationSensorManagerBase() {
     }
 
     private fun shouldEnableHighAccuracyMode(): Boolean {
-
         val highAccuracyModeBTDevicesSetting = getSetting(
             latestContext,
             backgroundLocation,
@@ -485,8 +486,9 @@ class LocationSensorManager : LocationSensorManagerBase() {
                 if (foundDevices.isNotEmpty()) {
                     highAccuracyModeBTDevices.remove(it)
                     foundDevices.forEach { btDevice ->
-                        if (!highAccuracyModeBTDevices.contains(btDevice.address))
+                        if (!highAccuracyModeBTDevices.contains(btDevice.address)) {
                             highAccuracyModeBTDevices.add(btDevice.address)
+                        }
                     }
                     updatedBtDeviceNames = true
                 }
@@ -506,8 +508,11 @@ class LocationSensorManager : LocationSensorManagerBase() {
             btDevConnected = bluetoothDevices.any { it.connected && highAccuracyModeBTDevices.contains(it.address) }
 
             if (!forceHighAccuracyModeOn && !forceHighAccuracyModeOff) {
-                if (!btDevConnected) Log.d(TAG, "High accuracy mode disabled, because defined ($highAccuracyModeBTDevices) bluetooth device(s) not connected (Connected devices: $bluetoothDevices)")
-                else Log.d(TAG, "High accuracy mode enabled, because defined ($highAccuracyModeBTDevices) bluetooth device(s) connected (Connected devices: $bluetoothDevices)")
+                if (!btDevConnected) {
+                    Log.d(TAG, "High accuracy mode disabled, because defined ($highAccuracyModeBTDevices) bluetooth device(s) not connected (Connected devices: $bluetoothDevices)")
+                } else {
+                    Log.d(TAG, "High accuracy mode enabled, because defined ($highAccuracyModeBTDevices) bluetooth device(s) connected (Connected devices: $bluetoothDevices)")
+                }
             }
         }
 
@@ -524,8 +529,11 @@ class LocationSensorManager : LocationSensorManagerBase() {
             inZone = zoneExpEntered || zoneExited
 
             if (!forceHighAccuracyModeOn && !forceHighAccuracyModeOff) {
-                if (!inZone) Log.d(TAG, "High accuracy mode disabled, because not in zone $highAccuracyExpZones")
-                else Log.d(TAG, "High accuracy mode enabled, because in zone $highAccuracyExpZones")
+                if (!inZone) {
+                    Log.d(TAG, "High accuracy mode disabled, because not in zone $highAccuracyExpZones")
+                } else {
+                    Log.d(TAG, "High accuracy mode enabled, because in zone $highAccuracyExpZones")
+                }
             }
         }
 
@@ -572,11 +580,14 @@ class LocationSensorManager : LocationSensorManagerBase() {
                 settingName = SETTING_SEND_LOCATION_AS,
                 settingType = SensorSettingType.LIST,
                 entries = listOf(
-                    SEND_LOCATION_AS_EXACT, SEND_LOCATION_AS_ZONE_ONLY
+                    SEND_LOCATION_AS_EXACT,
+                    SEND_LOCATION_AS_ZONE_ONLY
                 ),
                 default = SEND_LOCATION_AS_EXACT
             )
-        } else SEND_LOCATION_AS_EXACT
+        } else {
+            SEND_LOCATION_AS_EXACT
+        }
     }
 
     private fun removeAllLocationUpdateRequests() {
@@ -590,7 +601,9 @@ class LocationSensorManager : LocationSensorManagerBase() {
             Log.d(TAG, "Removing background location requests.")
             val backgroundIntent = getLocationUpdateIntent(false)
             fusedLocationProviderClient?.removeLocationUpdates(backgroundIntent)
-        } else Log.d(TAG, "Cannot remove background location requests. Location provider is not set.")
+        } else {
+            Log.d(TAG, "Cannot remove background location requests. Location provider is not set.")
+        }
     }
 
     private fun removeGeofenceUpdateRequests() {
@@ -601,7 +614,9 @@ class LocationSensorManager : LocationSensorManagerBase() {
             geofenceRegistered.clear()
             lastEnteredGeoZones.clear()
             lastExitedGeoZones.clear()
-        } else Log.d(TAG, "Cannot remove geofence location requests. Geofence provider is not set.")
+        } else {
+            Log.d(TAG, "Cannot remove geofence location requests. Geofence provider is not set.")
+        }
     }
 
     private fun requestLocationUpdates() {
@@ -1148,8 +1163,9 @@ class LocationSensorManager : LocationSensorManagerBase() {
         context: Context
     ) {
         latestContext = context
-        if (isEnabled(context, zoneLocation) || isEnabled(context, backgroundLocation))
+        if (isEnabled(context, zoneLocation) || isEnabled(context, backgroundLocation)) {
             setupLocationTracking()
+        }
         val sensorDao = AppDatabase.getInstance(latestContext).sensorDao()
         val sensorSetting = sensorDao.getSettings(singleAccurateLocation.id)
         val includeSensorUpdate = sensorSetting.firstOrNull { it.name == SETTING_INCLUDE_SENSOR_UPDATE }?.value ?: "false"
@@ -1161,7 +1177,8 @@ class LocationSensorManager : LocationSensorManagerBase() {
                     }
                 )
             }
-        } else
+        } else {
             sensorDao.add(SensorSetting(singleAccurateLocation.id, SETTING_INCLUDE_SENSOR_UPDATE, "false", SensorSettingType.TOGGLE))
+        }
     }
 }
diff --git a/app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearActivity.kt b/app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearActivity.kt
@@ -115,7 +115,6 @@ class SettingsWearActivity : AppCompatActivity(), CapabilityClient.OnCapabilityC
     }
 
     private suspend fun findWearDevicesWithApp() {
-
         try {
             val capabilityInfo = capabilityClient
                 .getCapability(CAPABILITY_WEAR_APP, CapabilityClient.FILTER_ALL)
@@ -135,7 +134,6 @@ class SettingsWearActivity : AppCompatActivity(), CapabilityClient.OnCapabilityC
     }
 
     private suspend fun findAllWearDevices() {
-
         try {
             val connectedNodes = nodeClient.connectedNodes.await()
 
@@ -151,7 +149,6 @@ class SettingsWearActivity : AppCompatActivity(), CapabilityClient.OnCapabilityC
     }
 
     private fun updateUI() {
-
         val wearNodesWithApp = wearNodesWithApp
         val allConnectedNodes = allConnectedNodes
 
@@ -185,7 +182,6 @@ class SettingsWearActivity : AppCompatActivity(), CapabilityClient.OnCapabilityC
     }
 
     private fun openPlayStoreOnWearDevicesWithoutApp() {
-
         val wearNodesWithApp = wearNodesWithApp ?: return
         val allConnectedNodes = allConnectedNodes ?: return
 

diff --git a/app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearDetection.kt b/app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearDetection.kt
@@ -22,7 +22,7 @@ object SettingsWearDetection {
         } catch (e: Exception) {
             if (e is ApiException && e.statusCode == CommonStatusCodes.API_NOT_CONNECTED && e.message?.contains("API_UNAVAILABLE") == true) {
                 // Wearable.API is not available on this device.
-                Log.d(TAG, "API unavailable for discovering nodes (no Wear)",)
+                Log.d(TAG, "API unavailable for discovering nodes (no Wear)")
             } else {
                 Log.e(TAG, "Exception while discovering nodes", e)
             }

diff --git a/app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearViewModel.kt b/app/src/full/java/io/homeassistant/companion/android/settings/wear/SettingsWearViewModel.kt
@@ -125,8 +125,11 @@ class SettingsWearViewModel @Inject constructor(
                     Log.e(TAG, "Exception while rendering template", e)
                     // JsonMappingException suggests that template is not a String (= error)
                     templateTileContentRendered.value = getApplication<Application>().getString(
-                        if (e.cause is JsonMappingException) commonR.string.template_error
-                        else commonR.string.template_render_error
+                        if (e.cause is JsonMappingException) {
+                            commonR.string.template_error
+                        } else {
+                            commonR.string.template_render_error
+                        }
                     )
                 }
             }
@@ -136,10 +139,11 @@ class SettingsWearViewModel @Inject constructor(
     }
 
     fun onEntitySelected(checked: Boolean, entityId: String) {
-        if (checked)
+        if (checked) {
             favoriteEntityIds.add(entityId)
-        else
+        } else {
             favoriteEntityIds.remove(entityId)
+        }
         sendHomeFavorites(favoriteEntityIds.toList())
     }
 

diff --git a/.../full/java/io/homeassistant/companion/android/settings/wear/views/SettingsWearMainView.kt b/.../full/java/io/homeassistant/companion/android/settings/wear/views/SettingsWearMainView.kt
@@ -79,7 +79,8 @@ class SettingsWearMainView : AppCompatActivity() {
         if (result != null) {
             val (url, authCode, deviceName, deviceTrackingEnabled, _) = result
             settingsWearViewModel.sendAuthToWear(url, authCode, deviceName, deviceTrackingEnabled, true)
-        } else
+        } else {
             Log.e(TAG, "onOnboardingComplete: Activity result returned null intent data")
+        }
     }
 }
diff --git a/app/src/full/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt b/app/src/full/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
@@ -33,7 +33,7 @@ class EntityGridVehicleScreen(
     carContext: CarContext,
     val integrationRepository: IntegrationRepository,
     val title: String,
-    val entitiesFlow: Flow<List<Entity<*>>>,
+    val entitiesFlow: Flow<List<Entity<*>>>
 ) : Screen(carContext) {
 
     companion object {

diff --git a/app/src/full/java/io/homeassistant/companion/android/vehicle/HaCarAppService.kt b/app/src/full/java/io/homeassistant/companion/android/vehicle/HaCarAppService.kt
@@ -86,7 +86,9 @@ class HaCarAppService : CarAppService() {
                     serverManager.integrationRepository(id).getEntities()
                         ?.associate { it.entityId to it }
                         ?.toMutableMap()
-                } else null
+                } else {
+                    null
+                }
             if (entities != null) {
                 allEntities.emit(entities.toImmutableMap())
                 serverManager.integrationRepository(id).getEntityUpdates()?.collect { entity ->

diff --git a/app/src/full/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt b/app/src/full/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt
@@ -58,15 +58,15 @@ class MainVehicleScreen(
             "lock" to commonR.string.locks,
             "scene" to commonR.string.scenes,
             "script" to commonR.string.scripts,
-            "switch" to commonR.string.switches,
+            "switch" to commonR.string.switches
         )
         private val SUPPORTED_DOMAINS = SUPPORTED_DOMAINS_WITH_STRING.keys
 
         private val MAP_DOMAINS = listOf(
             "device_tracker",
             "person",
             "sensor",
-            "zone",
+            "zone"
         )
     }
 

diff --git a/app/src/full/java/io/homeassistant/companion/android/vehicle/MapVehicleScreen.kt b/app/src/full/java/io/homeassistant/companion/android/vehicle/MapVehicleScreen.kt
@@ -34,7 +34,7 @@ import io.homeassistant.companion.android.common.R as commonR
 class MapVehicleScreen(
     carContext: CarContext,
     val integrationRepository: IntegrationRepository,
-    val entitiesFlow: Flow<List<Entity<*>>>,
+    val entitiesFlow: Flow<List<Entity<*>>>
 ) : Screen(carContext) {
 
     companion object {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -142,7 +142,7 @@
                 android:resource="@xml/entity_widget_info" />
         </receiver>
 
-        <receiver android:name=".widgets.media_player_controls.MediaPlayerControlsWidget" android:label="@string/widget_media_player_description"
+        <receiver android:name=".widgets.mediaplayer.MediaPlayerControlsWidget" android:label="@string/widget_media_player_description"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -205,7 +205,7 @@
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
-        <activity android:name=".widgets.media_player_controls.MediaPlayerControlsWidgetConfigureActivity"
+        <activity android:name=".widgets.mediaplayer.MediaPlayerControlsWidgetConfigureActivity"
             android:configChanges="orientation|screenSize"
             android:exported="true">
             <intent-filter>