From 3eb97e623fc54c31ac553ed21a323242a6615571 Mon Sep 17 00:00:00 2001 From: plebeius Date: Mon, 23 Feb 2026 19:00:50 +0800 Subject: [PATCH] fix(android): log reject failures, handle trailing slashes in path, remove unused attr param --- .../src/main/java/fivechan/android/FileUploaderPlugin.java | 3 ++- android/app/src/main/java/fivechan/android/FileUtils.java | 4 ++++ .../src/main/java/fivechan/android/MediaUploadRecipes.java | 7 ++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/java/fivechan/android/FileUploaderPlugin.java b/android/app/src/main/java/fivechan/android/FileUploaderPlugin.java index 692d92b3..49ce7ea4 100644 --- a/android/app/src/main/java/fivechan/android/FileUploaderPlugin.java +++ b/android/app/src/main/java/fivechan/android/FileUploaderPlugin.java @@ -113,7 +113,8 @@ public class FileUploaderPlugin extends Plugin { Log.e(TAG, "Upload failed", e); try { call.reject("Upload failed: " + e.getMessage()); - } catch (Exception ignored) { + } catch (Exception rejectEx) { + Log.e(TAG, "Failed to reject call", rejectEx); } } }) diff --git a/android/app/src/main/java/fivechan/android/FileUtils.java b/android/app/src/main/java/fivechan/android/FileUtils.java index 317a085b..f65cfb51 100644 --- a/android/app/src/main/java/fivechan/android/FileUtils.java +++ b/android/app/src/main/java/fivechan/android/FileUtils.java @@ -51,8 +51,12 @@ public class FileUtils { if (result == null) { String path = uri.getPath(); if (path != null) { + path = path.replaceAll("/+$", ""); int cut = path.lastIndexOf('/'); result = (cut != -1) ? path.substring(cut + 1) : path; + if (result.isEmpty()) { + result = "unknown"; + } } else { result = "unknown"; } diff --git a/android/app/src/main/java/fivechan/android/MediaUploadRecipes.java b/android/app/src/main/java/fivechan/android/MediaUploadRecipes.java index 51dbee1a..5dc8b0c4 100644 --- a/android/app/src/main/java/fivechan/android/MediaUploadRecipes.java +++ b/android/app/src/main/java/fivechan/android/MediaUploadRecipes.java @@ -134,7 +134,6 @@ public final class MediaUploadRecipes { */ public static String getSuccessJs(String provider) { String[] selectorCandidates; - String attribute; if (PROVIDER_IMGUR.equals(provider)) { selectorCandidates = new String[] { @@ -143,7 +142,6 @@ public final class MediaUploadRecipes { "[class*=\"copy-link\"] input", "[data-link]", }; - attribute = "href"; } else if (PROVIDER_POSTIMAGES.equals(provider)) { selectorCandidates = new String[] { @@ -152,14 +150,13 @@ public final class MediaUploadRecipes { "[class*=\"direct-link\"]", "textarea", }; - attribute = "value"; } else { return null; } - return buildSuccessJs(selectorCandidates, attribute); + return buildSuccessJs(selectorCandidates); } - private static String buildSuccessJs(String[] selectors, String attr) { + private static String buildSuccessJs(String[] selectors) { StringBuilder sb = new StringBuilder("(function(){var s=["); for (int i = 0; i < selectors.length; i++) { if (i > 0) sb.append(",");