Skip to content

Replace retrofit api dependency with implementation #5950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
boguszpawlowski wants to merge 9 commits into
base: main
Choose a base branch
from
+648 −65
Draft

Replace retrofit api dependency with implementation #5950

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f313227
Remove retrofit api dependency
boguszpawlowski Oct 18, 2025
2127995
Run ktlintFormat
boguszpawlowski Oct 18, 2025
e5861dc
Bring back mock google services json
boguszpawlowski Oct 18, 2025
0a93c4f
Fix missed class
boguszpawlowski Oct 18, 2025
e5ac7c0
Fix view model tests
boguszpawlowski Oct 18, 2025
7811882
Run ktlintFormat
boguszpawlowski Oct 18, 2025
37b6e3d
Create http exceptions in onResponse of the retrofit call
boguszpawlowski Nov 22, 2025
acb2316
Add a comment on call factory.
boguszpawlowski Nov 22, 2025
ae2397c
Make call factory internal
boguszpawlowski Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ com.squareup.okhttp3:okhttp:5.2.1=fullDebugAndroidTestCompileClasspath,fullDebug
com.squareup.okio:okio-jvm:3.16.1=fullDebugAndroidTestCompileClasspath,fullDebugAndroidTestRuntimeClasspath,fullDebugCompileClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestCompileClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugAndroidTestRuntimeClasspath,minimalDebugCompileClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestCompileClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup.okio:okio:3.16.1=fullDebugAndroidTestCompileClasspath,fullDebugAndroidTestRuntimeClasspath,fullDebugCompileClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestCompileClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugAndroidTestRuntimeClasspath,minimalDebugCompileClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestCompileClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup.retrofit2:converter-kotlinx-serialization:3.0.0=fullDebugRuntimeClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup.retrofit2:retrofit-bom:3.0.0=fullDebugAndroidTestCompileClasspath,fullDebugCompileClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestCompileClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugCompileClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestCompileClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup.retrofit2:retrofit:3.0.0=fullDebugAndroidTestCompileClasspath,fullDebugCompileClasspath,fullDebugRuntimeClasspath,fullDebugScreenshotTestCompileClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestCompileClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseCompileClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestCompileClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestCompileClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugAndroidTestCompileClasspath,minimalDebugCompileClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestCompileClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestCompileClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseCompileClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestCompileClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestCompileClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup.retrofit2:retrofit-bom:3.0.0=fullDebugRuntimeClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup.retrofit2:retrofit:3.0.0=fullDebugRuntimeClasspath,fullDebugScreenshotTestRuntimeClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseRuntimeClasspath,fullReleaseScreenshotTestRuntimeClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugRuntimeClasspath,minimalDebugScreenshotTestRuntimeClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseRuntimeClasspath,minimalReleaseScreenshotTestRuntimeClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup:javapoet:1.13.0=_agp_internal_javaPreCompileFullDebug_kspClasspath,_agp_internal_javaPreCompileFullRelease_kspClasspath,_agp_internal_javaPreCompileMinimalDebug_kspClasspath,_agp_internal_javaPreCompileMinimalRelease_kspClasspath,hiltAnnotationProcessorFullDebug,hiltAnnotationProcessorFullDebugAndroidTest,hiltAnnotationProcessorFullDebugUnitTest,hiltAnnotationProcessorFullRelease,hiltAnnotationProcessorFullReleaseUnitTest,hiltAnnotationProcessorMinimalDebug,hiltAnnotationProcessorMinimalDebugAndroidTest,hiltAnnotationProcessorMinimalDebugUnitTest,hiltAnnotationProcessorMinimalRelease,hiltAnnotationProcessorMinimalReleaseUnitTest,kspFullDebugAndroidTestKotlinProcessorClasspath,kspFullDebugKotlinProcessorClasspath,kspFullDebugScreenshotTestKotlinProcessorClasspath,kspFullDebugUnitTestKotlinProcessorClasspath,kspFullReleaseKotlinProcessorClasspath,kspFullReleaseScreenshotTestKotlinProcessorClasspath,kspFullReleaseUnitTestKotlinProcessorClasspath,kspMinimalDebugAndroidTestKotlinProcessorClasspath,kspMinimalDebugKotlinProcessorClasspath,kspMinimalDebugScreenshotTestKotlinProcessorClasspath,kspMinimalDebugUnitTestKotlinProcessorClasspath,kspMinimalReleaseKotlinProcessorClasspath,kspMinimalReleaseScreenshotTestKotlinProcessorClasspath,kspMinimalReleaseUnitTestKotlinProcessorClasspath
com.squareup:javawriter:2.1.1=fullDebugAndroidTestRuntimeClasspath,fullDebugUnitTestRuntimeClasspath,fullReleaseUnitTestRuntimeClasspath,minimalDebugAndroidTestRuntimeClasspath,minimalDebugUnitTestRuntimeClasspath,minimalReleaseUnitTestRuntimeClasspath
com.squareup:kotlinpoet:1.11.0=_agp_internal_javaPreCompileFullDebug_kspClasspath,_agp_internal_javaPreCompileFullRelease_kspClasspath,_agp_internal_javaPreCompileMinimalDebug_kspClasspath,_agp_internal_javaPreCompileMinimalRelease_kspClasspath,hiltAnnotationProcessorFullDebug,hiltAnnotationProcessorFullDebugAndroidTest,hiltAnnotationProcessorFullDebugUnitTest,hiltAnnotationProcessorFullRelease,hiltAnnotationProcessorFullReleaseUnitTest,hiltAnnotationProcessorMinimalDebug,hiltAnnotationProcessorMinimalDebugAndroidTest,hiltAnnotationProcessorMinimalDebugUnitTest,hiltAnnotationProcessorMinimalRelease,hiltAnnotationProcessorMinimalReleaseUnitTest,kspFullDebugAndroidTestKotlinProcessorClasspath,kspFullDebugKotlinProcessorClasspath,kspFullDebugScreenshotTestKotlinProcessorClasspath,kspFullDebugUnitTestKotlinProcessorClasspath,kspFullReleaseKotlinProcessorClasspath,kspFullReleaseScreenshotTestKotlinProcessorClasspath,kspFullReleaseUnitTestKotlinProcessorClasspath,kspMinimalDebugAndroidTestKotlinProcessorClasspath,kspMinimalDebugKotlinProcessorClasspath,kspMinimalDebugScreenshotTestKotlinProcessorClasspath,kspMinimalDebugUnitTestKotlinProcessorClasspath,kspMinimalReleaseKotlinProcessorClasspath,kspMinimalReleaseScreenshotTestKotlinProcessorClasspath,kspMinimalReleaseUnitTestKotlinProcessorClasspath
Expand Down
9 changes: 3 additions & 6 deletions app/src/main/kotlin/io/homeassistant/companion/android/controls/HaControlsProviderService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import io.homeassistant.companion.android.common.data.servers.ServerManager
import io.homeassistant.companion.android.common.data.websocket.impl.entities.AreaRegistryResponse
import io.homeassistant.companion.android.common.data.websocket.impl.entities.DeviceRegistryResponse
import io.homeassistant.companion.android.common.data.websocket.impl.entities.EntityRegistryResponse
import io.homeassistant.companion.android.common.exception.HttpException
import io.homeassistant.companion.android.util.RegistriesDataHandler
import java.time.LocalDateTime
import java.util.concurrent.Flow
Expand All @@ -27,10 +28,6 @@ import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.cancel
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.ResponseBody
import okhttp3.ResponseBody.Companion.toResponseBody
import retrofit2.HttpException
import retrofit2.Response
import timber.log.Timber

@RequiresApi(Build.VERSION_CODES.R)
Expand Down Expand Up @@ -309,7 +306,7 @@ class HaControlsProviderService : ControlsProviderService() {
if (serverManager.integrationRepository(serverId).isHomeAssistantVersionAtLeast(2022, 4, 0)) {
webSocketScope.launch {
var sentInitial = false
val error404 = HttpException(Response.error<ResponseBody>(404, byteArrayOf().toResponseBody()))
val error404 = HttpException(404, "Not Found")

serverManager.webSocketRepository(serverId).getCompressedStateAndChanges(entityIds)
?.collect { event ->
Expand Down Expand Up @@ -535,7 +532,7 @@ class HaControlsProviderService : ControlsProviderService() {
private fun getFailedEntity(entityId: String, exception: Exception): Entity {
return Entity(
entityId = entityId,
state = if (exception is HttpException && exception.code() == 404) "notfound" else "exception",
state = if (exception is HttpException && exception.code == 404) "notfound" else "exception",
attributes = mapOf<String, String>(),
lastChanged = LocalDateTime.now(),
lastUpdated = LocalDateTime.now(),
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/io/homeassistant/companion/android/launch/LaunchActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import io.homeassistant.companion.android.BuildConfig
import io.homeassistant.companion.android.common.R as commonR
import io.homeassistant.companion.android.common.data.integration.DeviceRegistration
import io.homeassistant.companion.android.common.data.servers.ServerManager
import io.homeassistant.companion.android.common.exception.HttpException
import io.homeassistant.companion.android.common.util.AppVersion
import io.homeassistant.companion.android.common.util.MessagingToken
import io.homeassistant.companion.android.common.util.MessagingTokenProvider
Expand All @@ -44,7 +45,6 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import retrofit2.HttpException
import timber.log.Timber

private const val EXTRA_SERVER_URL_TO_ONBOARD = "extra_server_url_to_onboard"
Expand Down Expand Up @@ -261,7 +261,7 @@ class LaunchActivity :
.setTitle(commonR.string.error_connection_failed)
.setMessage(
when {
e is HttpException && e.code() == 404 -> commonR.string.error_with_registration
e is HttpException && e.code == 404 -> commonR.string.error_with_registration
e is SSLHandshakeException -> commonR.string.webview_error_FAILED_SSL_HANDSHAKE
e is SSLException -> commonR.string.webview_error_SSL_INVALID
else -> commonR.string.webview_error
Expand Down
Loading