From bcbd7d994497fbc2c1473315360747634e4e8c27 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Thu, 2 Oct 2025 15:50:55 +0200 Subject: [PATCH 1/2] Revert okhttp update due to issue with IPP --- gradle/libs.versions.toml | 2 +- .../com/woocommerce/android/apifaker/ApiFakerInterceptor.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9647091f88f..ad28f6bf649c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,7 +94,7 @@ robolectric = "4.14" sentry = '5.8.0' squareup-javapoet = "1.7.0" squareup-leakcanary = '2.14' -squareup-okhttp3 = "5.1.0" +squareup-okhttp3 = "4.9.0" stripe-terminal = '4.6.0' tinder-statemachine = '0.2.0' volley = "1.1.1" diff --git a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerInterceptor.kt b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerInterceptor.kt index fe68ed8509df..13d0dcc6d937 100644 --- a/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerInterceptor.kt +++ b/libs/apifaker/src/main/java/com/woocommerce/android/apifaker/ApiFakerInterceptor.kt @@ -6,8 +6,8 @@ import okhttp3.Interceptor.Chain import okhttp3.MediaType.Companion.toMediaType import okhttp3.Protocol import okhttp3.Response -import okhttp3.ResponseBody import okhttp3.ResponseBody.Companion.toResponseBody +import okhttp3.internal.EMPTY_RESPONSE import javax.inject.Inject private const val ARTIFICIAL_DELAY_MS = 500L @@ -41,7 +41,7 @@ internal class ApiFakerInterceptor @Inject constructor( .code(fakeResponse.statusCode) // TODO check if it's safe to always use JSON as the content type .body( - fakeResponse.body?.toResponseBody("application/json".toMediaType()) ?: ResponseBody.EMPTY + fakeResponse.body?.toResponseBody("application/json".toMediaType()) ?: EMPTY_RESPONSE ) .addHeader("content-type", "application/json") .build() From 78b8a5de5d0d7ed13c415e2839bed2b21f36b445 Mon Sep 17 00:00:00 2001 From: malinajirka Date: Thu, 2 Oct 2025 15:57:17 +0200 Subject: [PATCH 2/2] Update release notes --- RELEASE-NOTES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ae89d3d83d53..21ea017fbcb0 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -9,6 +9,9 @@ ----- +23.3.1 +----- +- [***] Fix broken IPP flow [https://github.com/woocommerce/woocommerce-android/pull/14679[ 23.3 ----- - [Internal] Migration to POS specific product model [https://github.com/woocommerce/woocommerce-android/pull/14598]