From a21a76c23861d74dc5526a380e00ca81cc8054cc Mon Sep 17 00:00:00 2001 From: Ondrej Ruttkay Date: Tue, 16 Jan 2024 15:20:35 +0100 Subject: [PATCH 1/2] Handle the null URL property returned by the API --- .../com/woocommerce/android/media/MediaFilesRepository.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt index dad61fb5bda..e48c663e700 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt @@ -3,6 +3,7 @@ package com.woocommerce.android.media import android.content.Context import android.net.Uri import com.woocommerce.android.R +import com.woocommerce.android.extensions.isNotNullOrEmpty import com.woocommerce.android.media.MediaFilesRepository.UploadResult.UploadFailure import com.woocommerce.android.media.MediaFilesRepository.UploadResult.UploadSuccess import com.woocommerce.android.tools.SelectedSite @@ -145,7 +146,7 @@ class MediaFilesRepository @Inject constructor( event.completed -> { val media = event.media - val channelResult = if (media != null && media.url.isNotBlank()) { + val channelResult = if (media != null && media.url.isNotNullOrEmpty() && media.url.isNotBlank()) { WooLog.i(T.MEDIA, "MediaFilesRepository > uploaded media ${media.id}") producerScope.trySendBlocking( UploadSuccess(media) From 272ad6060b37d25d33d58989fc6547c1a6f55d02 Mon Sep 17 00:00:00 2001 From: Ondrej Ruttkay Date: Tue, 16 Jan 2024 15:41:58 +0100 Subject: [PATCH 2/2] Checking for null/empty URL should suffice --- .../com/woocommerce/android/media/MediaFilesRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt index e48c663e700..768fac5c962 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/media/MediaFilesRepository.kt @@ -146,7 +146,7 @@ class MediaFilesRepository @Inject constructor( event.completed -> { val media = event.media - val channelResult = if (media != null && media.url.isNotNullOrEmpty() && media.url.isNotBlank()) { + val channelResult = if (media != null && media.url.isNotNullOrEmpty()) { WooLog.i(T.MEDIA, "MediaFilesRepository > uploaded media ${media.id}") producerScope.trySendBlocking( UploadSuccess(media)