[for discussion] Use OkHttp 5

app/src/main/java/io/homeassistant/companion/android/notifications/MessagingManager.kt

@@ -90,9 +90,9 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import okio.sink
 import org.json.JSONObject
 import java.io.File
-import java.io.FileOutputStream
 import java.net.URL
 import java.net.URLDecoder
 import javax.inject.Inject
@@ -1319,10 +1319,11 @@ class MessagingManager @Inject constructor(
                         videoFile.parentFile?.mkdirs()
                         videoFile.createNewFile()
                     }
-                    FileOutputStream(videoFile).use { output ->
-                        response.body?.byteStream()?.copyTo(output)
+                    response.body.source().use { source ->
+                        videoFile.sink().use { sink ->
+                            source.readAll(sink)
+                        }
                     }
-                    response.close()
 
                     mediaRetriever.setDataSource(videoFile.absolutePath)
                     val durationInMicroSeconds = ((mediaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLongOrNull() ?: VIDEO_GUESS_MILLISECONDS)) * 1000

common/src/main/java/io/homeassistant/companion/android/common/data/HomeAssistantApis.kt

@@ -1,11 +1,14 @@
 package io.homeassistant.companion.android.common.data
 
+import android.content.Context
+import android.content.pm.PackageManager
 import android.os.Build
 import android.webkit.CookieManager
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.homeassistant.companion.android.common.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -15,7 +18,8 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class HomeAssistantApis @Inject constructor(
-    private val tlsHelper: TLSHelper
+    private val tlsHelper: TLSHelper,
+    @ApplicationContext private val appContext: Context
 ) {
     companion object {
         private const val LOCAL_HOST = "http://localhost/"
@@ -41,18 +45,20 @@ class HomeAssistantApis @Inject constructor(
                     .build()
             )
         }
-        // Only deal with cookies when on non wear device and for now I don't have a better
-        // way to determine if we are really on wear os....
-        // TODO: Please fix me.
-        var cookieManager: CookieManager? = null
-        try {
-            cookieManager = CookieManager.getInstance()
-        } catch (e: Exception) {
-            // Noop
-        }
-        if (cookieManager != null) {
-            builder.cookieJar(CookieJarCookieManagerShim())
+
+        val isWear = appContext.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)
+        if (!isWear) {
+            var cookieManager: CookieManager? = null
+            try {
+                cookieManager = CookieManager.getInstance()
+            } catch (e: Exception) {
+                // Noop
+            }
+            if (cookieManager != null) {
+                builder.cookieJar(CookieJarCookieManagerShim())
+            }
         }
+
         builder.callTimeout(CALL_TIMEOUT, TimeUnit.SECONDS)
         builder.readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
 

common/src/main/java/io/homeassistant/companion/android/common/sensors/NetworkSensorManager.kt

@@ -459,7 +459,7 @@ class NetworkSensorManager : SensorManager {
             override fun onResponse(call: Call, response: Response) {
                 if (!response.isSuccessful) throw IOException("Unexpected response code $response")
                 try {
-                    val jsonObject = JSONObject(response.body!!.string())
+                    val jsonObject = JSONObject(response.body.string())
                     ip = jsonObject.getString("ip")
                 } catch (e: JSONException) {
                     Log.e(TAG, "Unable to parse ip address from response", e)

common/src/main/java/io/homeassistant/companion/android/common/util/TextUtil.kt

@@ -1,18 +1,10 @@
 package io.homeassistant.companion.android.common.util
 
-import okhttp3.internal.and
+import okio.ByteString.Companion.toByteString
 import java.util.Locale
 
-private val HEX_ARRAY = "0123456789ABCDEF".toCharArray()
-
-fun ByteArray.toHexString(): String { // From https://stackoverflow.com/a/9855338/4214819
-    val hexChars = CharArray(this.size * 2)
-    for (j in 0 until this.size) {
-        val v = get(j) and 0xFF
-        hexChars[j * 2] = HEX_ARRAY[v ushr 4]
-        hexChars[j * 2 + 1] = HEX_ARRAY[v and 0x0F]
-    }
-    return String(hexChars)
+fun ByteArray.toHexString(): String {
+    return toByteString().hex().uppercase()
 }
 
 fun String.capitalize(locale: Locale) =

gradle/libs.versions.toml

@@ -42,7 +42,7 @@ lifecycle = "2.6.2"
 material = "1.10.0"
 media3 = "1.1.1"
 navigation-compose = "2.7.4"
-okhttp = "4.12.0"
+okhttp = "5.0.0-alpha.11"
 paging = "3.2.1"
 picasso = "2.8"
 play-services-threadnetwork = "16.0.0"

wear/src/main/java/io/homeassistant/companion/android/tiles/CameraTile.kt

@@ -117,7 +117,7 @@ class CameraTile : TileService() {
                         val maxHeight = requestParams.deviceConfiguration.screenHeightDp * requestParams.deviceConfiguration.screenDensity
                         withContext(Dispatchers.IO) {
                             val response = okHttpClient.newCall(Request.Builder().url(url).build()).execute()
-                            byteArray = response.body?.byteStream()?.readBytes()
+                            byteArray = response.body.byteStream().readBytes()
                             byteArray?.let {
                                 var bitmap = BitmapFactory.decodeByteArray(it, 0, it.size)
                                 if (bitmap.width > maxWidth || bitmap.height > maxHeight) {