Merge release/23.4 into trunk

RELEASE-NOTES.txt

@@ -8,6 +8,7 @@
 23.4
 -----
 - [*] Fixed an issue where Blaze campaign creation could fail for products using PDF thumbnails as images [https://github.com/woocommerce/woocommerce-android/pull/14642]
+- [*] Fixed a rare media upload error [https://github.com/woocommerce/woocommerce-android/pull/14716]
 
 23.3.1
 -----

fastlane/metadata/android/ar/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+تم تحسين تجربة حملة Blaze! يمكن الآن إنشاء الحملات بسلاسة لجميع المنتجات، بما في ذلك تلك التي تحتوي على صور مصغرة بصيغة PDF. يمكنك التحديث اليوم للاستمتاع بتجربة إعلانية أكثر موثوقية.

fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Wir haben das Erlebnis mit Blaze-Kampagnen verbessert! Das Erstellen von Kampagnen funktioniert jetzt reibungslos für alle Produkte, auch mit PDF-Vorschaubildern. Führe noch heute ein Update durch, um ein zuverlässigeres Werbeerlebnis zu erhalten.

fastlane/metadata/android/es-ES/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Hemos mejorado la experiencia de campañas de Blaze. La creación de campañas ahora funciona a la perfección en todos los productos, incluidos los que tienen miniaturas en PDF. Actualiza ya tu versión para disfrutar de una experiencia publicitaria más fiable.

fastlane/metadata/android/fr-FR/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4 :
+Nous avons amélioré l’expérience de campagne Blaze ! La création de campagnes fonctionne désormais sans accroc pour tous les produits, y compris ceux avec des miniatures PDF. Mettez à jour dès aujourd’hui pour une expérience publicitaire plus fiable.

fastlane/metadata/android/id/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Pengalaman kampanye Blaze sekarang makin ciamik! Pembuatan kampanye untuk produk apa pun kini lancar jaya, termasuk produk dengan gambar mini PDF. Perbarui sekarang juga dan rasakan cara beriklan yang lebih andal.

fastlane/metadata/android/it-IT/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Abbiamo migliorato l'esperienza della campagna Blaze! La creazione di campagne ora funziona senza problemi per tutti i prodotti, inclusi quelli con miniature PDF. Aggiorna oggi stesso per un'esperienza pubblicitaria più affidabile.

fastlane/metadata/android/iw-IL/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+שיפרנו את חוויית הקמפיין של Blaze! יצירת קמפיינים פועלת כעת באופן חלק עבור כל המוצרים, כולל קמפיינים עם תמונות ממוזערות של PDF. כדאי לעדכן היום כדי ליהנות מחוויית פרסום יציבה יותר.

fastlane/metadata/android/ja-JP/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Blaze キャンペーンのエクスペリエンスが向上しました。キャンペーンの作成が、PDF のサムネイルを含むすべての商品でスムーズに機能するようになりました。今すぐ更新して、より信頼性の高い広告エクスペリエンスを実現しましょう。

fastlane/metadata/android/ko-KR/changelogs/default.txt

@@ -0,0 +1,3 @@
+23.4:
+Blaze 경험이 개선되었습니다! PDF 썸네일이 포함된 상품을 포함한 모든 상품에서 수월하게 캠페인을 만들 수 있습니다. 지금 업데이트하면 더욱 안정적인 광고 경험을 이용할 수 있습니다.
+

fastlane/metadata/android/nl-NL/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+We hebben de campagne-ervaring van Blaze verbeterd! Campagnes maken werkt nu probleemloos voor alle producten, inclusief die met pdf-miniaturen. Update vandaag nog voor een betrouwbaardere advertentie-ervaring.

fastlane/metadata/android/pt-BR/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Melhoramos a experiência da campanha no Blaze! Agora a criação de campanhas funciona perfeitamente para todos os produtos, incluindo aqueles com miniaturas de PDF. Atualize hoje para ter uma experiência publicitária mais confiável.

fastlane/metadata/android/ru-RU/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Кампании Blaze стали ещё лучше! Теперь при создании кампаний не будет проблем даже с теми товарами, у которых имеются миниатюры в формате PDF. Установите обновление, чтобы ваша реклама работала без сбоев.

fastlane/metadata/android/sv-SE/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Vi har förbättrat Blaze-kampanjupplevelsen! Att skapa kampanjer fungerar nu smidigt för alla produkter, inklusive de med PDF-miniatyrer. Uppdatera idag för en mer tillförlitlig annonseringsupplevelse.

fastlane/metadata/android/tr-TR/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4:
+Blaze kampanyası deneyimi iyileştirildi! Kampanyalar oluşturmak artık PDF küçük resimli olanlar dahil tüm ürünler için sorunsuz bir şekilde çalışır. Daha güvenilir bir reklam deneyimi için hemen bugün güncelleyin.

fastlane/metadata/android/zh-CN/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4：
+我们优化了 Blaze 广告活动体验！现在，使用所有产品（包括带有 PDF 缩略图的产品）均能顺畅地创建广告活动。立即更新，享受更可靠的广告体验。

fastlane/metadata/android/zh-TW/changelogs/default.txt

@@ -0,0 +1,2 @@
+23.4：
+我們已提升 Blaze 行銷活動體驗！現在可順暢為所有產品建立行銷活動，包括具備 PDF 縮圖的產品。立即更新即可享有更可靠的廣告體驗。

libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetwork.kt

@@ -1,16 +1,19 @@
 package org.wordpress.android.fluxc.network.rest.wpcom.wc
 
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.BaseRequest
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetwork
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkingMode
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsNetwork
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsStore
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.JetpackApplicationPasswordsErrorHandler
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.JetpackApplicationPasswordsSupport
 import org.wordpress.android.fluxc.network.rest.wpcom.JetpackTunnelWPAPINetwork
 import org.wordpress.android.util.AppLog
+import java.security.GeneralSecurityException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -140,7 +143,19 @@ class WooNetwork @Inject constructor(
             )
         }
 
-        return when (val appPasswordsResponse = applicationPasswordsNetwork.request()) {
+        val appPasswordsResponse = try {
+            applicationPasswordsNetwork.request()
+        } catch (e: GeneralSecurityException) {
+            AppLog.e(AppLog.T.API, "Error setting up Application Passwords encryption", e)
+            WPAPIResponse.Error(
+                error = WPAPINetworkError(
+                    baseError = BaseRequest.BaseNetworkError(BaseRequest.GenericErrorType.UNKNOWN),
+                    errorCode = ApplicationPasswordsStore.APPLICATION_PASSWORDS_KEYSTORE_ENCRYPTION_ERROR
+                )
+            )
+        }
+
+        return when (appPasswordsResponse) {
             is WPAPIResponse.Success<*> -> {
                 (appPasswordsResponse as WPAPIResponse<T>).copyWith(
                     networkingMode = WPAPINetworkingMode.ApplicationPasswordsWithJetpack

libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetworkTest.kt

@@ -3,6 +3,8 @@ package org.wordpress.android.fluxc.network.rest.wpcom.wc
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.eq
 import org.mockito.kotlin.given
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
@@ -14,10 +16,12 @@ import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsNetwork
+import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsStore
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.JetpackApplicationPasswordsErrorHandler
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.JetpackApplicationPasswordsSupport
 import org.wordpress.android.fluxc.network.rest.wpcom.JetpackTunnelWPAPINetwork
 import org.wordpress.android.fluxc.test
+import java.security.GeneralSecurityException
 
 @RunWith(RobolectricTestRunner::class)
 class WooNetworkTest {
@@ -138,6 +142,33 @@ class WooNetworkTest {
         verify(jetpackApplicationPasswordsErrorHandler).handleError(testSite, appPasswordsNetworkError)
     }
 
+    @Test
+    fun `when a KeyStore error occurs, then fallback to Jetpack Tunnel`() = test {
+        given(jetpackApplicationPasswordsSupport.supportsAppPasswords(testSite)).willReturn(true)
+        given(
+            applicationPasswordsNetwork.executeGetGsonRequest(
+                testSite,
+                testPath,
+                SampleResponse::class.java
+            )
+        ).willAnswer {
+            throw GeneralSecurityException()
+        }
+        givenJetpackTunnelResponse(WPAPIResponse.Success(SampleResponse("value"), emptyList()))
+
+        val response = sut.executeGetGsonRequest(
+            site = testSite,
+            path = testPath,
+            clazz = SampleResponse::class.java
+        )
+
+        assertThat((response as WPAPIResponse.Success).data).isEqualTo(SampleResponse("value"))
+        verify(jetpackApplicationPasswordsErrorHandler).handleError(
+            eq(testSite),
+            argThat { errorCode == ApplicationPasswordsStore.APPLICATION_PASSWORDS_KEYSTORE_ENCRYPTION_ERROR }
+        )
+    }
+
     private suspend fun givenAppPasswordsResponse(response: WPAPIResponse<SampleResponse>) {
         given(
             applicationPasswordsNetwork.executeGetGsonRequest(

libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java

@@ -6,12 +6,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.yarolegovich.wellsql.core.Identifiable;
-import com.yarolegovich.wellsql.core.annotation.Column;
-import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
-import com.yarolegovich.wellsql.core.annotation.RawConstraints;
-import com.yarolegovich.wellsql.core.annotation.Table;
-
 import org.wordpress.android.fluxc.Payload;
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId;
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId;
@@ -26,6 +20,12 @@
 import java.util.Arrays;
 import java.util.Objects;
 
+import com.yarolegovich.wellsql.core.Identifiable;
+import com.yarolegovich.wellsql.core.annotation.Column;
+import com.yarolegovich.wellsql.core.annotation.PrimaryKey;
+import com.yarolegovich.wellsql.core.annotation.RawConstraints;
+import com.yarolegovich.wellsql.core.annotation.Table;
+
 // WARN: This class is used within WordPress-MediaPicker-Android, do not remove!
 @Table
 @RawConstraints({"UNIQUE (SITE_ID, URL)"})
@@ -257,7 +257,7 @@ public class SiteModel extends Payload<BaseNetworkError> implements Identifiable
     @Column
     private String mApplicationPasswordsAuthorizeUrl;
     @Column
-    private Boolean mCanBlaze;
+    private boolean mCanBlaze;
     // Comma-separated list of active features in the site's plan
     @Column
     private String mPlanActiveFeatures;
@@ -1109,11 +1109,11 @@ public void setPublishedStatus(int publishedStatus) {
         this.mPublishedStatus = publishedStatus;
     }
 
-    public Boolean getCanBlaze() {
+    public boolean getCanBlaze() {
         return mCanBlaze;
     }
 
-    public void setCanBlaze(Boolean canBlaze) {
+    public void setCanBlaze(boolean canBlaze) {
         this.mCanBlaze = canBlaze;
     }
 

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordsStore.kt

@@ -19,6 +19,7 @@ class ApplicationPasswordsStore @Inject constructor(
         private const val USERNAME_PREFERENCE_KEY_PREFIX = "username_"
         private const val PASSWORD_PREFERENCE_KEY_PREFIX = "app_password_"
         private const val UUID_PREFERENCE_KEY_PREFIX = "app_password_uuid_"
+        const val APPLICATION_PASSWORDS_KEYSTORE_ENCRYPTION_ERROR = "application_passwords_keystore_encryption_error"
     }
 
     @Inject internal lateinit var configuration: ApplicationPasswordsConfiguration

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/JetpackApplicationPasswordsErrorHandler.kt

@@ -39,7 +39,8 @@ class JetpackApplicationPasswordsErrorHandler @Inject constructor(
             httpStatusCode == TOO_MANY_REQUESTS ||
             apiErrorCode == "incorrect_password" ||
             apiErrorCode == ApplicationPasswordsManager.APPLICATION_PASSWORDS_DISABLED_ERROR_CODE ||
-            apiErrorCode == ApplicationPasswordsManager.APPLICATION_PASSWORDS_DISABLED_USER_ERROR_CODE
+            apiErrorCode == ApplicationPasswordsManager.APPLICATION_PASSWORDS_DISABLED_USER_ERROR_CODE ||
+            apiErrorCode == ApplicationPasswordsStore.APPLICATION_PASSWORDS_KEYSTORE_ENCRYPTION_ERROR
         ) {
             appLogWrapper.w(
                 AppLog.T.API,

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/media/MediaWPRESTResponse.kt

@@ -40,7 +40,7 @@ data class MediaWPRESTResponse(
         val height: Int,
         val file: String?,
         val sizes: Sizes?
-    )
+    ) : JsonObjectOrEmptyArray()
 
     data class Sizes(
         val medium: ImageSize?,
@@ -80,9 +80,9 @@ fun MediaWPRESTResponse.toMediaModel(localSiteId: Int) = MediaModel(
     StringEscapeUtils.unescapeHtml4(altText),
     mediaDetails.width,
     mediaDetails.height,
-        0,
-        null,
-        false,
+    0,
+    null,
+    false,
     if (MediaWPComRestResponse.DELETED_STATUS == status) {
         MediaUploadState.DELETED
     } else {

libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/JetpackApplicationPasswordsErrorHandlerTests.kt

@@ -175,4 +175,20 @@ class JetpackApplicationPasswordsErrorHandlerTests {
             )
         )
     }
+
+    @Test
+    fun `given KeyStore error, when handling error, then flag site as unsupported`() {
+        // Given
+        val baseError = BaseNetworkError(mock<VolleyError>())
+        val networkError = WPAPINetworkError(
+            baseError,
+            ApplicationPasswordsStore.APPLICATION_PASSWORDS_KEYSTORE_ENCRYPTION_ERROR
+        )
+
+        // When
+        errorHandler.handleError(testSite, networkError)
+
+        // Then
+        verify(jetpackApplicationPasswordsSupport).flagAsUnsupported(testSite)
+    }
 }

version.properties

@@ -1,2 +1,2 @@
-versionName=23.4-rc-2
-versionCode=698
+versionName=23.4
+versionCode=699