Fixes silent error when entering an invalid URL in an image input

Zailer43 · Sep 10, 2024 · 176f77d · 176f77d
1 parent dc8659c
commit 176f77d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/fzmm/zailer/me/client/gui/components/image/ImageButtonComponent.java b/src/main/java/fzmm/zailer/me/client/gui/components/image/ImageButtonComponent.java
@@ -67,15 +67,17 @@ public void loadImageFromText(IImageLoaderFromText imageLoaderFromText, String v
                 .build();
 
         CompletableFuture.supplyAsync(() -> {
-            MinecraftClient.getInstance().execute(() -> {
-                this.active = true;
-                SnackBarManager.getInstance().add(loadingSnackBar);
-            });
+            MinecraftClient.getInstance().execute(() -> SnackBarManager.getInstance().add(loadingSnackBar));
 
             return imageLoaderFromText.loadImage(value);
-        }).thenApply(status -> {
+        }).whenComplete((status, throwable) -> {
             Optional<BufferedImage> image = imageLoaderFromText.getImage();
 
+            if (throwable != null) {
+                FzmmClient.LOGGER.error("[ImageButtonComponent] Unexpected error loading an image", throwable);
+                status = ImageStatus.UNEXPECTED_ERROR;
+            }
+
             SnackBarBuilder snackBarStatus = BaseSnackBarComponent.builder(SnackBarManager.IMAGE_ID)
                     .title(status.getStatusTranslation())
                     .backgroundColor(status.getColor());
@@ -90,7 +92,7 @@ public void loadImageFromText(IImageLoaderFromText imageLoaderFromText, String v
             } else {
                 if (this.imageLoadEvent != null) {
                     assert image.isPresent();
-                    status = this.imageLoadEvent.apply(image.get());
+                    this.imageLoadEvent.apply(image.get());
                 }
                 snackBarStatus.lowTimer();
                 FzmmClient.LOGGER.info("[ImageButtonComponent] Image loaded successfully");
@@ -102,14 +104,12 @@ public void loadImageFromText(IImageLoaderFromText imageLoaderFromText, String v
                 SnackBarManager.getInstance().add(snackBarStatus.startTimer().build());
             });
 
-
             if (this.image != null) {
                 this.image.flush();
             }
 
             this.image = image.orElse(null);
-            return status;
-        }).thenAccept(status -> {
+
             if (this.callback != null) {
                 this.callback.accept(this.image);
             }

diff --git a/src/main/java/fzmm/zailer/me/client/gui/components/image/source/ImageUrlSource.java b/src/main/java/fzmm/zailer/me/client/gui/components/image/source/ImageUrlSource.java
@@ -23,17 +23,18 @@ public ImageStatus loadImage(String value) {
         }
         this.image = null;
         try {
-            if (value.isEmpty())
+            if (value.isEmpty()) {
                 return ImageStatus.NO_IMAGE_LOADED;
+            }
 
             Optional<BufferedImage> optionalImage = ImageUtils.getImageFromUrl(value);
             this.image = optionalImage.orElse(null);
 
             return optionalImage.isEmpty() ? ImageStatus.URL_HAS_NO_IMAGE : ImageStatus.IMAGE_LOADED;
-        } catch (MalformedURLException ignored) {
+        } catch (MalformedURLException | IllegalArgumentException ignored) {
             return ImageStatus.MALFORMED_URL;
         } catch (IOException e) {
-            FzmmClient.LOGGER.error("Unexpected error loading an image", e);
+            FzmmClient.LOGGER.error("[ImageUrlSource] Unexpected error loading an image", e);
             return ImageStatus.UNEXPECTED_ERROR;
         }
     }