From 592fe9917570f0c5c31c0497c912e1caf71ecf5d Mon Sep 17 00:00:00 2001 From: Gray Zhang Date: Wed, 17 Sep 2025 18:36:03 +0800 Subject: [PATCH] fix: add null checks in HtmlMovementMethod to prevent crashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add null check for imgs collection before iterating - Add null check for currentImg before comparison - Add null check for imgs.get(i) and its getUrl() method - Prevents NullPointerException when clicking on image spans - Fixes crash reported in Google Play Console at line 215 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .../v2er/widget/richtext/HtmlMovementMethod.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/me/ghui/v2er/widget/richtext/HtmlMovementMethod.java b/app/src/main/java/me/ghui/v2er/widget/richtext/HtmlMovementMethod.java index 10052fe4..dff1b4ff 100644 --- a/app/src/main/java/me/ghui/v2er/widget/richtext/HtmlMovementMethod.java +++ b/app/src/main/java/me/ghui/v2er/widget/richtext/HtmlMovementMethod.java @@ -211,10 +211,14 @@ private void onSpanClick(CharacterStyle span) { } else if (span instanceof ImageSpan) { String currentImg = ((ImageSpan) span).getSource(); int index = 0; - for (int i = 0; i < imgs.size(); i++) { - if (currentImg.equals(imgs.get(i).getUrl())) { - index = i; - break; + // Add null checks to prevent NullPointerException + if (imgs != null && currentImg != null) { + for (int i = 0; i < imgs.size(); i++) { + String imgUrl = imgs.get(i) != null ? imgs.get(i).getUrl() : null; + if (currentImg.equals(imgUrl)) { + index = i; + break; + } } } ImagesInfo imagesInfo = new ImagesInfo(index, imgs);