Merge pull request #13425 from woocommerce/merge/release-21.5-into-trunk

Merge release/21.5 into trunk
woocommerce · Jan 30, 2025 · 5558af5 · 5558af5
2 parents 32dd18c + 3fc239d
commit 5558af5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/...main/kotlin/com/woocommerce/android/ui/payments/receipt/preview/ReceiptPreviewFragment.kt b/...main/kotlin/com/woocommerce/android/ui/payments/receipt/preview/ReceiptPreviewFragment.kt
@@ -18,6 +18,7 @@ import com.woocommerce.android.ui.base.BaseFragment
 import com.woocommerce.android.ui.base.UIMessageResolver
 import com.woocommerce.android.util.PrintHtmlHelper
 import com.woocommerce.android.util.UiHelpers
+import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar
 import dagger.hilt.android.AndroidEntryPoint
 import java.io.IOException
@@ -38,6 +39,8 @@ class ReceiptPreviewFragment : BaseFragment(R.layout.fragment_receipt_preview),
     private var _binding: FragmentReceiptPreviewBinding? = null
     private val binding get() = _binding!!
 
+    private var urlToLoad: String? = null
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -58,10 +61,12 @@ class ReceiptPreviewFragment : BaseFragment(R.layout.fragment_receipt_preview),
                 viewModel.onPrintClicked()
                 true
             }
+
             R.id.menu_send -> {
                 viewModel.onShareClicked()
                 true
             }
+
             else -> false
         }
     }
@@ -101,9 +106,12 @@ class ReceiptPreviewFragment : BaseFragment(R.layout.fragment_receipt_preview),
                     override fun shouldInterceptRequest(
                         view: WebView,
                         request: WebResourceRequest
-                    ): WebResourceResponse? {
-                        return interceptAndModifyReceiptResponse(request)
-                    }
+                    ): WebResourceResponse? =
+                        if (request.url.toString() == urlToLoad) {
+                            interceptAndModifyReceiptResponse(request)
+                        } else {
+                            null
+                        }
 
                     override fun onPageFinished(view: WebView, url: String) {
                         viewModel.onReceiptLoaded()
@@ -129,7 +137,8 @@ class ReceiptPreviewFragment : BaseFragment(R.layout.fragment_receipt_preview),
         } catch (e: MalformedURLException) {
             throw IllegalArgumentException("Invalid receipt URL: ${request.url}", e)
         } catch (e: IOException) {
-            throw IOException("Failed to read content from receipt URL: ${request.url}", e)
+            WooLog.e(WooLog.T.ORDERS, "Failed to read content from receipt URL: ${request.url}", e)
+            null
         }
     }
 
@@ -140,7 +149,10 @@ class ReceiptPreviewFragment : BaseFragment(R.layout.fragment_receipt_preview),
         }
         viewModel.event.observe(viewLifecycleOwner) {
             when (it) {
-                is LoadUrl -> binding.receiptPreviewPreviewWebview.loadUrl(it.url)
+                is LoadUrl -> {
+                    urlToLoad = it.url
+                    binding.receiptPreviewPreviewWebview.loadUrl(it.url)
+                }
                 is PrintReceipt -> printHtmlHelper.printReceipt(requireActivity(), it.receiptUrl, it.documentName)
                 is ShowSnackbar -> uiMessageResolver.showSnack(it.message)
                 else -> it.isHandled = false

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-versionName=21.5-rc-1
-versionCode=638
+versionName=21.5-rc-2
+versionCode=639