fix(android): preventPreClearDrawable and silence some okhttp errors

farfromrefug · farfromrefug · commit 0db61df32564 · 2025-11-25T11:14:18.000+01:00
diff --git a/packages/image/platforms/android/java/com/nativescript/image/CustomDataFetcher.java b/packages/image/platforms/android/java/com/nativescript/image/CustomDataFetcher.java
@@ -13,6 +13,11 @@
 import java.io.InputStream;
 import java.util.Map;
 import android.util.Log;
+import java.io.FilterInputStream;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 
 public class CustomDataFetcher implements DataFetcher<InputStream> {
     private final Call.Factory client;
@@ -26,6 +31,73 @@ public CustomDataFetcher(Call.Factory client, CustomGlideUrl url) {
         this.url = url;
     }
 
+    // Buffer-less wrapper that masks cancel/reset IOExceptions so they don't yield large stack traces
+    private static class MaskingInputStream extends FilterInputStream {
+        protected MaskingInputStream(InputStream in) { super(in); }
+
+        @Override
+        public int read() throws IOException {
+            try {
+                return super.read();
+            } catch (IOException e) {
+                if (isCancelException(e)) {
+                    throw SilentCancelException.INSTANCE;
+                }
+                throw e;
+            }
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            try {
+                return super.read(b, off, len);
+            } catch (IOException e) {
+                if (isCancelException(e)) {
+                    throw SilentCancelException.INSTANCE;
+                }
+                throw e;
+            }
+        }
+    }
+
+    // A throwable that avoids printing stack traces or messages when logged.
+    private static final class SilentCancelException extends IOException {
+        static final SilentCancelException INSTANCE = new SilentCancelException();
+        private SilentCancelException() {
+            super((String) null);
+            setStackTrace(new StackTraceElement[0]);
+        }
+        @Override
+        public String toString() { return ""; }
+        @Override
+        public void printStackTrace(PrintStream s) { /* no-op */ }
+        @Override
+        public void printStackTrace(PrintWriter s) { /* no-op */ }
+        @Override
+        public synchronized Throwable fillInStackTrace() { return this; }
+    }
+
+    // Heuristic detection for request-cancellation exceptions (stream reset, socket closed, etc.)
+    private static boolean isCancelException(Throwable e) {
+        if (e == null) return false;
+        Throwable t = e;
+        while (t != null) {
+            String cls = t.getClass().getName();
+            if (cls != null && (cls.endsWith("StreamResetException") || cls.contains("StreamReset"))) {
+                return true;
+            }
+            if (t instanceof InterruptedIOException) return true;
+            if (t instanceof SocketException) return true;
+            String msg = t.getMessage();
+            if (msg != null) {
+                String lower = msg.toLowerCase();
+                if (lower.contains("cancel") || lower.contains("canceled") || lower.contains("stream was reset")) return true;
+            }
+            t = t.getCause();
+        }
+        return false;
+    }
+
     @Override
     public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
         // Build request with headers
@@ -82,9 +154,16 @@ public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super I
             }
 
             stream = responseBody.byteStream();
+            // Wrap to mask noisy "StreamResetException: stream was reset: CANCEL" traces
+            stream = new MaskingInputStream(stream);
             callback.onDataReady(stream);
 
         } catch (IOException e) {
+            // If request was canceled, call onLoadFailed with a trimmed exception (no stack trace) to avoid large logs
+            if (isCancelException(e)) {
+                callback.onLoadFailed(SilentCancelException.INSTANCE);
+                return;
+            }
             callback.onLoadFailed(e);
         }
     }
diff --git a/packages/image/platforms/android/java/com/nativescript/image/MatrixDrawableImageViewTarget.java b/packages/image/platforms/android/java/com/nativescript/image/MatrixDrawableImageViewTarget.java
@@ -20,6 +20,10 @@ public class MatrixDrawableImageViewTarget extends ViewTarget<ImageView, Drawabl
     @Nullable
     private Animatable animatable;
 
+    // If true, clear drawable first on load, error. Disabling will prevent flickering
+    // but wont look good with recycled views
+    private boolean mClearFirst = true;
+
   public MatrixDrawableImageViewTarget(ImageView view) {
     super(view);
   }
@@ -33,6 +37,15 @@ public MatrixDrawableImageViewTarget(ImageView view, boolean waitForLayout) {
     super(view, waitForLayout);
   }
 
+  /**
+   * Control whether to preserve current drawable on load start/clear.
+   * Default is true (clear). Call this immediately after creating the target if you want
+   * to disable this with false.
+   */
+  public void setClearFirst(boolean preserve) {
+      this.mClearFirst = preserve;
+  }
+
     /**
      * Returns the current {@link android.graphics.drawable.Drawable} being
      * displayed in the view
@@ -66,8 +79,9 @@ public void setDrawable(Drawable drawable) {
     @Override
     public void onLoadStarted(@Nullable Drawable placeholder) {
         super.onLoadStarted(placeholder);
-
-        // setResourceInternal(null);
+        if (this.mClearFirst) {
+            setResourceInternal(null);
+        }
         if (placeholder != null) {
             setDrawable(placeholder);
         }
@@ -83,7 +97,9 @@ public void onLoadStarted(@Nullable Drawable placeholder) {
     @Override
     public void onLoadFailed(@Nullable Drawable errorDrawable) {
         super.onLoadFailed(errorDrawable);
-        setResourceInternal(null);
+        if (this.mClearFirst) {
+            setResourceInternal(null);
+        }
         if (errorDrawable != null) {
             setDrawable(errorDrawable);
         }
@@ -102,7 +118,9 @@ public void onLoadCleared(@Nullable Drawable placeholder) {
         if (animatable != null) {
             animatable.stop();
         }
-        // setResourceInternal(null);
+        if (this.mClearFirst) {
+            setResourceInternal(null);
+        }
         if (placeholder != null) {
             setDrawable(placeholder);
         }
diff --git a/src/image/index.android.ts b/src/image/index.android.ts
@@ -407,6 +407,8 @@ export class Img extends ImageBase {
     //TODO: remove as it needs to be added after TS 5.7 change https://github.com/microsoft/TypeScript/pull/59860
     [key: symbol]: (...args: any[]) => any | void;
 
+    public preventPreClearDrawable = false;
+
     nativeViewProtected: com.nativescript.image.MatrixImageView;
     //@ts-expect-error just for declaration
     nativeImageViewProtected: com.nativescript.image.MatrixImageView;
@@ -442,6 +444,8 @@ export class Img extends ImageBase {
     }
 
     public disposeNativeView() {
+        // Cancel any running Glide requests before dispose
+        this.cancelCurrentRequest();
         this.progressCallback = null;
         this.loadSourceCallback = null;
     }
@@ -583,9 +587,35 @@ export class Img extends ImageBase {
         }
     }
 
+    // Clear any active Glide target/request attached to this view.
+    private cancelCurrentRequest(): void {
+        const ctx = this._context;
+        if (!ctx) {
+            return;
+        }
+        if (this.currentTarget) {
+            // cancel and drop reference; Any callbacks from the old target will be swallowed.
+            try {
+                com.bumptech.glide.Glide.with(ctx).clear(this.currentTarget);
+            } catch (err) {
+                // ignore
+            }
+            this.currentTarget = null;
+        }
+        // if (this.nativeViewProtected) {
+        //     try {
+        //         com.bumptech.glide.Glide.with(ctx).clear(this.nativeViewProtected);
+        //     } catch (err) {
+        //         // ignore
+        //     }
+        // }
+    }
+
     private loadImageWithGlide(uri: string) {
         const view = this.nativeViewProtected;
         const context = this._context;
+        // Cancel any prior Glide request/target for this view before starting a new one.
+        this.cancelCurrentRequest();
         // Determine if this is a network request
         this.isNetworkRequest = typeof uri === 'string' && (uri.startsWith('http://') || uri.startsWith('https://'));
 
@@ -747,6 +777,15 @@ export class Img extends ImageBase {
             onLoadFailed(e: any, model: any, target: any, isFirstResource: boolean): boolean {
                 const instance = owner.get();
                 if (instance) {
+                    // If this callback is for a previously canceled request, swallow it to avoid
+                    // emitting/logging errors for obsolete requests.
+                    if (instance.currentTarget && target !== instance.currentTarget) {
+                        instance.progressCallback = null;
+                        instance.loadSourceCallback = null;
+                        // Swallow: we handled it (don't let Glide default log/clear)
+                        return true;
+                    }
+                    instance.currentTarget = null;
                     instance.progressCallback = null; // Clean up
                     instance.loadSourceCallback = null;
                     instance.notifyFailure(e);
@@ -756,6 +795,13 @@ export class Img extends ImageBase {
             onResourceReady(resource: android.graphics.drawable.Drawable, model: any, target: any, dataSource: any, isFirstResource: boolean): boolean {
                 const instance = owner.get();
                 if (instance) {
+                    // Ignore if the callback is from a previous request (stale).
+                    if (instance.currentTarget && target !== instance.currentTarget) {
+                        instance.progressCallback = null;
+                        instance.loadSourceCallback = null;
+                        return true;
+                    }
+                    instance.currentTarget = null;
                     instance.progressCallback = null; // Clean up
                     instance.loadSourceCallback = null;
 
@@ -802,8 +848,14 @@ export class Img extends ImageBase {
             }
         });
 
-        this.currentTarget = new com.nativescript.image.MatrixDrawableImageViewTarget(view)
-        requestBuilder.signature(signature).listener(new com.nativescript.image.CompositeRequestListener(objectArr)).into(this.currentTarget);
+        // Always create and track our custom target so we can detect stale callbacks later.
+        const target = new com.nativescript.image.MatrixDrawableImageViewTarget(view);
+        this.currentTarget = target;
+        if (this.preventPreClearDrawable) {
+            target.setClearFirst(false);
+        }
+
+        requestBuilder.signature(signature).listener(new com.nativescript.image.CompositeRequestListener(objectArr)).into(target);
     }
 
     private notifyLoadSource(source: string) {
@@ -942,12 +994,7 @@ export class Img extends ImageBase {
             this.loadImageWithGlide(uri);
         } else {
             // Clear existing request before removing the drawable
-            if (this.currentTarget) {
-                com.bumptech.glide.Glide.with(this._context).clear(this.currentTarget);
-                this.currentTarget = null;
-            } else {
-                com.bumptech.glide.Glide.with(this._context).clear(view);
-            }
+            this.cancelCurrentRequest();
             view.setImageDrawable(null);
         }
     }
@@ -1010,14 +1057,14 @@ export class Img extends ImageBase {
     }
 
     startAnimating() {
-        const drawable = this.nativeViewProtected.getDrawable()
+        const drawable = this.nativeViewProtected.getDrawable();
         if (drawable && drawable instanceof android.graphics.drawable.Animatable) {
             drawable.start();
         }
     }
 
     stopAnimating() {
-        const drawable = this.nativeViewProtected.getDrawable()
+        const drawable = this.nativeViewProtected.getDrawable();
         if (drawable && drawable instanceof android.graphics.drawable.Animatable) {
             drawable.stop();
         }
diff --git a/src/image/typings/ui_image.android.d.ts b/src/image/typings/ui_image.android.d.ts
@@ -419,6 +419,9 @@ declare namespace com {
 				public getOpacity(): number;
 			}
 			export class MatrixDrawableImageViewTarget extends com.bumptech.glide.request.target.ViewTarget<globalAndroid.widget.ImageView,globalAndroid.graphics.drawable.Drawable> implements com.bumptech.glide.request.transition.Transition.ViewAdapter  {
+                setClearFirst(arg0: boolean) {
+                    throw new Error('Method not implemented.');
+                }
 				public static class: java.lang.Class<com.nativescript.image.MatrixDrawableImageViewTarget>;
 				public constructor(view: globalAndroid.widget.ImageView);
 				public getCurrentDrawable(): globalAndroid.graphics.drawable.Drawable;
