Bump AGP, Gradle and Kotlin Versions (#1563)

home-assistant · Jun 8, 2021 · 89457c5 · 89457c5
1 parent 16f06a3
commit 89457c5
Show file tree

Hide file tree

Showing 91 changed files with 855 additions and 721 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("kotlin-kapt")
     id("kotlin-android-extensions")
     id("com.google.firebase.appdistribution")
-    id("com.github.triplet.play") version "3.0.0"
+    id("com.github.triplet.play") version "3.4.0-agp4.2"
     id("com.google.gms.google-services")
 }
 

diff --git a/app/src/full/java/io/homeassistant/companion/android/launch/LaunchPresenterImpl.kt b/app/src/full/java/io/homeassistant/companion/android/launch/LaunchPresenterImpl.kt
@@ -6,9 +6,9 @@ import io.homeassistant.companion.android.BuildConfig
 import io.homeassistant.companion.android.common.data.authentication.AuthenticationRepository
 import io.homeassistant.companion.android.common.data.integration.DeviceRegistration
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
-import javax.inject.Inject
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
+import javax.inject.Inject
 
 class LaunchPresenterImpl @Inject constructor(
     view: LaunchView,

diff --git a/...src/full/java/io/homeassistant/companion/android/location/HighAccuracyLocationReceiver.kt b/...src/full/java/io/homeassistant/companion/android/location/HighAccuracyLocationReceiver.kt
@@ -14,10 +14,10 @@ class HighAccuracyLocationReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         when (intent.action) {
             HIGH_ACCURACY_LOCATION_DISABLE ->
-            {
-                HighAccuracyLocationService.stopService(context)
-                LocationSensorManager.setHighAccuracyModeSetting(context, false)
-            }
+                {
+                    HighAccuracyLocationService.stopService(context)
+                    LocationSensorManager.setHighAccuracyModeSetting(context, false)
+                }
         }
     }
 }
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
@@ -85,12 +85,16 @@ class HighAccuracyLocationService : Service() {
                 longSeconds %= 60
                 val latDegree = if (latDegrees >= 0) "N" else "S"
                 val lonDegrees = if (longDegrees >= 0) "E" else "W"
-                (abs(latDegrees).toString() + "°" + latMinutes + "'" + latSeconds +
+                (
+                    abs(latDegrees).toString() + "°" + latMinutes + "'" + latSeconds +
                         "\"" + latDegree + " " + abs(longDegrees) + "°" + longMinutes +
-                        "'" + longSeconds + "\"" + lonDegrees)
+                        "'" + longSeconds + "\"" + lonDegrees
+                    )
             } catch (e: java.lang.Exception) {
-                ("" + String.format("%8.5f", latitude) + "  " +
-                        String.format("%8.5f", longitude))
+                (
+                    "" + String.format("%8.5f", latitude) + "  " +
+                        String.format("%8.5f", longitude)
+                    )
             }
         }
 

diff --git a/app/src/full/java/io/homeassistant/companion/android/notifications/MessagingService.kt b/app/src/full/java/io/homeassistant/companion/android/notifications/MessagingService.kt
@@ -57,14 +57,14 @@ import io.homeassistant.companion.android.util.cancel
 import io.homeassistant.companion.android.util.cancelGroupIfNeeded
 import io.homeassistant.companion.android.util.getActiveNotification
 import io.homeassistant.companion.android.webview.WebViewActivity
-import java.net.URL
-import java.util.Locale
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.net.URL
+import java.util.Locale
+import javax.inject.Inject
 
 class MessagingService : FirebaseMessagingService() {
     companion object {
@@ -135,15 +135,19 @@ class MessagingService : FirebaseMessagingService() {
         const val MEDIA_STOP = "stop"
 
         // Command groups
-        val DEVICE_COMMANDS = listOf(COMMAND_DND, COMMAND_RINGER_MODE, COMMAND_BROADCAST_INTENT,
+        val DEVICE_COMMANDS = listOf(
+            COMMAND_DND, COMMAND_RINGER_MODE, COMMAND_BROADCAST_INTENT,
             COMMAND_VOLUME_LEVEL, COMMAND_BLUETOOTH, COMMAND_BLE_TRANSMITTER, COMMAND_HIGH_ACCURACY_MODE, COMMAND_ACTIVITY,
-            COMMAND_WEBVIEW, COMMAND_SCREEN_ON, COMMAND_MEDIA)
+            COMMAND_WEBVIEW, COMMAND_SCREEN_ON, COMMAND_MEDIA
+        )
         val DND_COMMANDS = listOf(DND_ALARMS_ONLY, DND_ALL, DND_NONE, DND_PRIORITY_ONLY)
         val RM_COMMANDS = listOf(RM_NORMAL, RM_SILENT, RM_VIBRATE)
         val CHANNEL_VOLUME_STREAM = listOf(ALARM_STREAM, MUSIC_STREAM, NOTIFICATION_STREAM, RING_STREAM)
         val ENABLE_COMMANDS = listOf(TURN_OFF, TURN_ON)
-        val MEDIA_COMMANDS = listOf(MEDIA_FAST_FORWARD, MEDIA_NEXT, MEDIA_PAUSE, MEDIA_PLAY,
-            MEDIA_PLAY_PAUSE, MEDIA_PREVIOUS, MEDIA_REWIND, MEDIA_STOP)
+        val MEDIA_COMMANDS = listOf(
+            MEDIA_FAST_FORWARD, MEDIA_NEXT, MEDIA_PAUSE, MEDIA_PLAY,
+            MEDIA_PLAY_PAUSE, MEDIA_PREVIOUS, MEDIA_REWIND, MEDIA_STOP
+        )
     }
 
     @Inject
@@ -235,7 +239,8 @@ class MessagingService : FirebaseMessagingService() {
                         }
                         COMMAND_VOLUME_LEVEL -> {
                             if (!it["channel"].isNullOrEmpty() && it["channel"] in CHANNEL_VOLUME_STREAM &&
-                                !it[TITLE].isNullOrEmpty() && it[TITLE]?.toIntOrNull() != null)
+                                !it[TITLE].isNullOrEmpty() && it[TITLE]?.toIntOrNull() != null
+                            )
                                 handleDeviceCommands(it)
                             else {
                                 mainScope.launch {
@@ -354,7 +359,8 @@ class MessagingService : FirebaseMessagingService() {
         val maxAlarmVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_ALARM)
         if (tts.isNullOrEmpty())
             tts = getString(R.string.tts_no_title)
-        textToSpeech = TextToSpeech(applicationContext
+        textToSpeech = TextToSpeech(
+            applicationContext
         ) {
             if (it == TextToSpeech.SUCCESS) {
                 val listener = object : UtteranceProgressListener() {
@@ -454,7 +460,8 @@ class MessagingService : FirebaseMessagingService() {
                                 if (pair[1].isDigitsOnly())
                                     pair[1].toInt()
                                 else if ((pair[1].toLowerCase() == "true") ||
-                                    (pair[1].toLowerCase() == "false"))
+                                    (pair[1].toLowerCase() == "false")
+                                )
                                     pair[1].toBoolean()
                                 else pair[1]
                             )
@@ -542,8 +549,9 @@ class MessagingService : FirebaseMessagingService() {
                 val powerManager = applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager
                 val wakeLock = powerManager.newWakeLock(
                     PowerManager.FULL_WAKE_LOCK or
-                    PowerManager.ACQUIRE_CAUSES_WAKEUP or
-                    PowerManager.ON_AFTER_RELEASE, "HomeAssistant::NotificationScreenOnWakeLock"
+                        PowerManager.ACQUIRE_CAUSES_WAKEUP or
+                        PowerManager.ON_AFTER_RELEASE,
+                    "HomeAssistant::NotificationScreenOnWakeLock"
                 )
                 wakeLock.acquire(1 * 30 * 1000L /*30 seconds */)
                 wakeLock.release()
@@ -753,7 +761,8 @@ class MessagingService : FirebaseMessagingService() {
             builder.setSound(
                 RingtoneManager.getActualDefaultRingtoneUri(applicationContext, RingtoneManager.TYPE_ALARM)
                     ?: RingtoneManager.getActualDefaultRingtoneUri(applicationContext, RingtoneManager.TYPE_RINGTONE),
-                AudioManager.STREAM_ALARM)
+                AudioManager.STREAM_ALARM
+            )
         } else {
             builder.setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
         }
@@ -1088,9 +1097,11 @@ class MessagingService : FirebaseMessagingService() {
             .setLegacyStreamType(AudioManager.STREAM_ALARM)
             .setUsage(AudioAttributes.USAGE_ALARM)
             .build()
-        channel.setSound(RingtoneManager.getActualDefaultRingtoneUri(applicationContext, RingtoneManager.TYPE_ALARM)
-            ?: RingtoneManager.getActualDefaultRingtoneUri(applicationContext, RingtoneManager.TYPE_RINGTONE),
-            audioAttributes)
+        channel.setSound(
+            RingtoneManager.getActualDefaultRingtoneUri(applicationContext, RingtoneManager.TYPE_ALARM)
+                ?: RingtoneManager.getActualDefaultRingtoneUri(applicationContext, RingtoneManager.TYPE_RINGTONE),
+            audioAttributes
+        )
     }
 
     private fun parseVibrationPattern(
@@ -1133,7 +1144,8 @@ class MessagingService : FirebaseMessagingService() {
     private fun requestSystemAlertPermission() {
         val intent = Intent(
             Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-            Uri.parse("package:$packageName"))
+            Uri.parse("package:$packageName")
+        )
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
     }
@@ -1255,7 +1267,8 @@ class MessagingService : FirebaseMessagingService() {
                         if (pair[1].isDigitsOnly())
                             pair[1].toInt()
                         else if ((pair[1].toLowerCase() == "true") ||
-                            (pair[1].toLowerCase() == "false"))
+                            (pair[1].toLowerCase() == "false")
+                        )
                             pair[1].toBoolean()
                         else pair[1]
                     )

diff --git a/.../full/java/io/homeassistant/companion/android/notifications/NotificationActionReceiver.kt b/.../full/java/io/homeassistant/companion/android/notifications/NotificationActionReceiver.kt
@@ -13,11 +13,11 @@ import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
 import io.homeassistant.companion.android.util.NotificationActionContentHandler
 import io.homeassistant.companion.android.util.cancel
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 class NotificationActionReceiver : BroadcastReceiver() {
 

diff --git a/.../full/java/io/homeassistant/companion/android/notifications/NotificationDeleteReceiver.kt b/.../full/java/io/homeassistant/companion/android/notifications/NotificationDeleteReceiver.kt
@@ -10,8 +10,8 @@ import io.homeassistant.companion.android.R
 import io.homeassistant.companion.android.common.dagger.GraphComponentAccessor
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
 import io.homeassistant.companion.android.util.cancelGroupIfNeeded
-import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
+import javax.inject.Inject
 
 class NotificationDeleteReceiver : BroadcastReceiver() {
     companion object {

diff --git a/...meassistant/companion/android/onboarding/integration/MobileAppIntegrationPresenterImpl.kt b/...meassistant/companion/android/onboarding/integration/MobileAppIntegrationPresenterImpl.kt
@@ -4,8 +4,8 @@ import android.util.Log
 import com.google.firebase.iid.FirebaseInstanceId
 import io.homeassistant.companion.android.common.data.integration.DeviceRegistration
 import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
-import javax.inject.Inject
 import kotlinx.coroutines.tasks.await
+import javax.inject.Inject
 
 class MobileAppIntegrationPresenterImpl @Inject constructor(
     view: MobileAppIntegrationView,

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
@@ -32,11 +32,11 @@ import io.homeassistant.companion.android.database.sensor.Attribute
 import io.homeassistant.companion.android.database.sensor.Setting
 import io.homeassistant.companion.android.location.HighAccuracyLocationService
 import io.homeassistant.companion.android.util.DisabledLocationHandler
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import javax.inject.Inject
 
 class LocationSensorManager : BroadcastReceiver(), SensorManager {
 
@@ -540,10 +540,11 @@ class LocationSensorManager : BroadcastReceiver(), SensorManager {
 
     private fun sendLocationUpdate(location: Location, geofenceUpdate: Boolean = false) {
         Log.d(
-            TAG, "Last Location: " +
-                    "\nCoords:(${location.latitude}, ${location.longitude})" +
-                    "\nAccuracy: ${location.accuracy}" +
-                    "\nBearing: ${location.bearing}"
+            TAG,
+            "Last Location: " +
+                "\nCoords:(${location.latitude}, ${location.longitude})" +
+                "\nAccuracy: ${location.accuracy}" +
+                "\nBearing: ${location.bearing}"
         )
         var accuracy = 0
         if (location.accuracy.toInt() >= 0) {

diff --git a/app/src/main/java/io/homeassistant/companion/android/BaseActivity.kt b/app/src/main/java/io/homeassistant/companion/android/BaseActivity.kt
@@ -15,9 +15,9 @@ open class BaseActivity : AppCompatActivity() {
     override fun attachBaseContext(newBase: Context) {
 
         DaggerSettingsComponent.builder()
-                .appComponent((newBase.applicationContext as GraphComponentAccessor).appComponent)
-                .build()
-                .inject(this)
+            .appComponent((newBase.applicationContext as GraphComponentAccessor).appComponent)
+            .build()
+            .inject(this)
 
         super.attachBaseContext(lm.getContextWrapper(newBase))
     }

diff --git a/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt b/app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt
@@ -44,7 +44,8 @@ open class HomeAssistantApplication : Application(), GraphComponentAccessor {
         // This should be nearly instantaneous allowing automations to fire immediately when a phone is plugged
         // in or unplugged. Updates will also be triggered when the system reports low battery and when it recovers.
         registerReceiver(
-            sensorReceiver, IntentFilter().apply {
+            sensorReceiver,
+            IntentFilter().apply {
                 addAction(Intent.ACTION_BATTERY_LOW)
                 addAction(Intent.ACTION_BATTERY_OKAY)
                 addAction(Intent.ACTION_POWER_CONNECTED)
@@ -54,7 +55,8 @@ open class HomeAssistantApplication : Application(), GraphComponentAccessor {
 
         // This will cause interactive and power save to update upon a state change
         registerReceiver(
-            sensorReceiver, IntentFilter().apply {
+            sensorReceiver,
+            IntentFilter().apply {
                 addAction(Intent.ACTION_SCREEN_OFF)
                 addAction(Intent.ACTION_SCREEN_ON)
                 addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED)
@@ -64,7 +66,8 @@ open class HomeAssistantApplication : Application(), GraphComponentAccessor {
         // Update doze mode immediately on supported devices
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             registerReceiver(
-                sensorReceiver, IntentFilter().apply {
+                sensorReceiver,
+                IntentFilter().apply {
                     addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
                 }
             )
@@ -85,7 +88,8 @@ open class HomeAssistantApplication : Application(), GraphComponentAccessor {
         )
 
         // Listen for bluetooth state changes
-        registerReceiver(sensorReceiver,
+        registerReceiver(
+            sensorReceiver,
             IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED)
         )
 

diff --git a/app/src/main/java/io/homeassistant/companion/android/authenticator/Authenticator.kt b/app/src/main/java/io/homeassistant/companion/android/authenticator/Authenticator.kt
@@ -14,7 +14,8 @@ class Authenticator(context: Context, fragmentActivity: FragmentActivity, callba
     }
 
     private val executor = ContextCompat.getMainExecutor(context)
-    private val biometricPrompt = BiometricPrompt(fragmentActivity, executor,
+    private val biometricPrompt = BiometricPrompt(
+        fragmentActivity, executor,
         object : BiometricPrompt.AuthenticationCallback() {
             override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                 super.onAuthenticationError(errorCode, errString)
@@ -34,7 +35,8 @@ class Authenticator(context: Context, fragmentActivity: FragmentActivity, callba
                 super.onAuthenticationSucceeded(result)
                 callback(SUCCESS)
             }
-        })
+        }
+    )
 
     fun authenticate(title: String) {
         val promptDialog = BiometricPrompt.PromptInfo.Builder()

diff --git a/app/src/main/java/io/homeassistant/companion/android/bluetooth/ble/TransmitterManager.kt b/app/src/main/java/io/homeassistant/companion/android/bluetooth/ble/TransmitterManager.kt
@@ -4,10 +4,10 @@ import android.bluetooth.BluetoothAdapter
 import android.bluetooth.le.AdvertiseCallback
 import android.bluetooth.le.AdvertiseSettings
 import android.content.Context
-import java.util.UUID
 import org.altbeacon.beacon.Beacon
 import org.altbeacon.beacon.BeaconParser
 import org.altbeacon.beacon.BeaconTransmitter
+import java.util.UUID
 
 object TransmitterManager {
     private lateinit var physicalTransmitter: BeaconTransmitter
@@ -60,25 +60,28 @@ object TransmitterManager {
             val beacon = buildBeacon(haTransmitter)
             if (!physicalTransmitter.isStarted) {
                 physicalTransmitter.advertiseTxPowerLevel = getPowerLevel(haTransmitter)
-                physicalTransmitter.startAdvertising(beacon, object : AdvertiseCallback() {
-                    override fun onStartSuccess(settingsInEffect: AdvertiseSettings) {
-                        haTransmitter.transmitting = true
-                        haTransmitter.state = "Transmitting"
-                    }
-
-                    override fun onStartFailure(errorCode: Int) {
-                        if (errorCode != ADVERTISE_FAILED_ALREADY_STARTED) {
-                            haTransmitter.uuid = ""
-                            haTransmitter.major = ""
-                            haTransmitter.minor = ""
-                            haTransmitter.state = "Unable to transmit"
-                            haTransmitter.transmitting = false
-                        } else {
+                physicalTransmitter.startAdvertising(
+                    beacon,
+                    object : AdvertiseCallback() {
+                        override fun onStartSuccess(settingsInEffect: AdvertiseSettings) {
                             haTransmitter.transmitting = true
                             haTransmitter.state = "Transmitting"
                         }
+
+                        override fun onStartFailure(errorCode: Int) {
+                            if (errorCode != ADVERTISE_FAILED_ALREADY_STARTED) {
+                                haTransmitter.uuid = ""
+                                haTransmitter.major = ""
+                                haTransmitter.minor = ""
+                                haTransmitter.state = "Unable to transmit"
+                                haTransmitter.transmitting = false
+                            } else {
+                                haTransmitter.transmitting = true
+                                haTransmitter.state = "Transmitting"
+                            }
+                        }
                     }
-                })
+                )
             }
         } else {
             stopTransmitting(haTransmitter)

diff --git a/app/src/main/java/io/homeassistant/companion/android/controls/ClimateControl.kt b/app/src/main/java/io/homeassistant/companion/android/controls/ClimateControl.kt
@@ -53,7 +53,8 @@ class ClimateControl {
             val minValue = (entity.attributes["min_temp"] as? Number)?.toFloat() ?: 0f
             val maxValue = (entity.attributes["max_temp"] as? Number)?.toFloat() ?: 100f
             var currentValue = (entity.attributes["temperature"] as? Number)?.toFloat() ?: (
-                    entity.attributes["current_temperature"] as? Number)?.toFloat() ?: 0f
+                entity.attributes["current_temperature"] as? Number
+                )?.toFloat() ?: 0f
             // Ensure the current value is never lower than the minimum or higher than the maximum
             if (currentValue < minValue)
                 currentValue = minValue