fix(android): update view imageSource when image is set asynchronously (#11215)

CatchABus · web-flow · commit 6a84bdc853fc · 2026-06-11T22:21:51.000-07:00
diff --git a/packages/core/platforms/android/widgets-release.aar b/packages/core/platforms/android/widgets-release.aar
diff --git a/packages/core/ui/image/image-common.ts b/packages/core/ui/image/image-common.ts
@@ -124,7 +124,7 @@ export abstract class ImageBase extends View implements ImageDefinition {
 				);
 			}
 		} else if (value instanceof ImageSource) {
-			// Support binding the imageSource trough the src property
+			// Support binding the imageSource through the src property
 
 			// This will help avoid cleanup on the actual provided image source in case view gets disposed
 			this.imageSource = new ImageSource(value.getNativeSource());
diff --git a/packages/core/ui/image/index.android.ts b/packages/core/ui/image/index.android.ts
@@ -33,9 +33,22 @@ function initializeImageLoadedListener() {
 			return global.__native(this);
 		}
 
-		onImageLoaded(success: boolean): void {
+		public handlesImageUpdate(): boolean {
+			return true;
+		}
+
+		onImageLoaded(bitmapOrDrawable: android.graphics.Bitmap | android.graphics.drawable.Drawable): void {
 			const owner = this.owner;
 			if (owner) {
+				owner.imageSource = new ImageSource(bitmapOrDrawable);
+				owner.isLoading = false;
+			}
+		}
+
+		public onImageLoadingError(e: java.lang.Exception): void {
+			const owner = this.owner;
+			if (owner) {
+				owner.imageSource = null;
 				owner.isLoading = false;
 			}
 		}
@@ -45,7 +58,7 @@ function initializeImageLoadedListener() {
 }
 
 export class Image extends ImageBase {
-	nativeViewProtected: org.nativescript.widgets.ImageView;
+	declare nativeViewProtected: org.nativescript.widgets.ImageView;
 
 	public useCache = true;
 
@@ -86,7 +99,6 @@ export class Image extends ImageBase {
 
 		if (!value) {
 			imageView.setUri(null, 0, 0, false, false, true);
-
 			return;
 		}
 
diff --git a/packages/core/ui/image/index.ios.ts b/packages/core/ui/image/index.ios.ts
@@ -9,7 +9,7 @@ import { SDK_VERSION } from '../../utils/constants';
 export * from './image-common';
 
 export class Image extends ImageBase {
-	nativeViewProtected: UIImageView;
+	declare nativeViewProtected: UIImageView;
 	private _imageSourceAffectsLayout = true;
 	private _templateImageWasCreated: boolean;
 
diff --git a/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts b/packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
@@ -557,12 +557,16 @@
 
                 export namespace Worker {
                     interface IOnImageLoadedListener {
-                        onImageLoaded(success: boolean): void;
+                        handlesImageUpdate(): boolean;
+                        onImageLoaded(bitmapOrDrawable: globalAndroid.graphics.Bitmap | globalAndroid.graphics.drawable.Drawable): void;
+                        onImageLoadingError(e: java.lang.Exception): void;
                     }
 
                     export class OnImageLoadedListener implements IOnImageLoadedListener {
                         constructor(implementation: IOnImageLoadedListener);
-                        public onImageLoaded(success: boolean): void;
+                        public handlesImageUpdate(): boolean;
+                        public onImageLoaded(bitmapOrDrawable: globalAndroid.graphics.Bitmap | globalAndroid.graphics.drawable.Drawable): void;
+                        public onImageLoadingError(e: java.lang.Exception): void;
                     }
                 }
 
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
@@ -867,8 +867,7 @@ public String toDebugString() {
 			"backgroundBitmap: " + this.backgroundBitmap + "; " +
 			"backgroundRepeat: " + this.backgroundRepeat + "; " +
 			"backgroundPosition: " + this.backgroundPosition + "; " +
-			"backgroundSize: " + this.backgroundSize + "; "
-			;
+			"backgroundSize: " + this.backgroundSize + "; ";
 	}
 
 	@Override
@@ -879,13 +878,13 @@ public void setBitmap(Bitmap value) {
 	}
 
 	@Override
-	public void setDrawable(Drawable asyncDrawable) {
-		drawable = asyncDrawable;
+	public Drawable getDrawable() {
+		return drawable;
 	}
 
 	@Override
-	public Drawable getDrawable() {
-		return drawable;
+	public void setDrawable(Drawable value) {
+		drawable = value;
 	}
 
 
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java
@@ -428,7 +428,7 @@ public void setBitmap(Bitmap value) {
 	}
 
 	@Override
-	public void setDrawable(Drawable asyncDrawable) {
-		this.setImageDrawable(asyncDrawable);
+	public void setDrawable(Drawable value) {
+		this.setImageDrawable(value);
 	}
 }
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/image/BitmapOwner.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/image/BitmapOwner.java
@@ -9,9 +9,6 @@
 
 public interface BitmapOwner {
 	void setBitmap(Bitmap value);
-
-	void setDrawable(Drawable asyncDrawable);
-
+	void setDrawable(Drawable value);
 	Drawable getDrawable();
-
 }
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/image/Worker.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/image/Worker.java

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export abstract class ImageBase extends View implements ImageDefinition {`
`124`	`124`	`);`
`125`	`125`	`}`
`126`	`126`	`} else if (value instanceof ImageSource) {`
`127`		`- // Support binding the imageSource trough the src property`
	`127`	`+ // Support binding the imageSource through the src property`
`128`	`128`
`129`	`129`	`// This will help avoid cleanup on the actual provided image source in case view gets disposed`
`130`	`130`	`this.imageSource = new ImageSource(value.getNativeSource());`
Original file line number	Diff line number	Diff line change
`@@ -557,12 +557,16 @@`
`557`	`557`
`558`	`558`	`export namespace Worker {`
`559`	`559`	`interface IOnImageLoadedListener {`
`560`		`- onImageLoaded(success: boolean): void;`
	`560`	`+ handlesImageUpdate(): boolean;`
	`561`	`+ onImageLoaded(bitmapOrDrawable: globalAndroid.graphics.Bitmap \| globalAndroid.graphics.drawable.Drawable): void;`
	`562`	`+ onImageLoadingError(e: java.lang.Exception): void;`
`561`	`563`	`}`
`562`	`564`
`563`	`565`	`export class OnImageLoadedListener implements IOnImageLoadedListener {`
`564`	`566`	`constructor(implementation: IOnImageLoadedListener);`
`565`		`- public onImageLoaded(success: boolean): void;`
	`567`	`+ public handlesImageUpdate(): boolean;`
	`568`	`+ public onImageLoaded(bitmapOrDrawable: globalAndroid.graphics.Bitmap \| globalAndroid.graphics.drawable.Drawable): void;`
	`569`	`+ public onImageLoadingError(e: java.lang.Exception): void;`
`566`	`570`	`}`
`567`	`571`	`}`
`568`	`572`
Original file line number	Diff line number	Diff line change
`@@ -867,8 +867,7 @@ public String toDebugString() {`
`867`	`867`	`"backgroundBitmap: " + this.backgroundBitmap + "; " +`
`868`	`868`	`"backgroundRepeat: " + this.backgroundRepeat + "; " +`
`869`	`869`	`"backgroundPosition: " + this.backgroundPosition + "; " +`
`870`		`- "backgroundSize: " + this.backgroundSize + "; "`
`871`		`- ;`
	`870`	`+ "backgroundSize: " + this.backgroundSize + "; ";`
`872`	`871`	`}`
`873`	`872`
`874`	`873`	`@Override`
`@@ -879,13 +878,13 @@ public void setBitmap(Bitmap value) {`
`879`	`878`	`}`
`880`	`879`
`881`	`880`	`@Override`
`882`		`- public void setDrawable(Drawable asyncDrawable) {`
`883`		`- drawable = asyncDrawable;`
	`881`	`+ public Drawable getDrawable() {`
	`882`	`+ return drawable;`
`884`	`883`	`}`
`885`	`884`
`886`	`885`	`@Override`
`887`		`- public Drawable getDrawable() {`
`888`		`- return drawable;`
	`886`	`+ public void setDrawable(Drawable value) {`
	`887`	`+ drawable = value;`
`889`	`888`	`}`
`890`	`889`
`891`	`890`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ public void setBitmap(Bitmap value) {`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`@Override`
`431`		`- public void setDrawable(Drawable asyncDrawable) {`
`432`		`- this.setImageDrawable(asyncDrawable);`
	`431`	`+ public void setDrawable(Drawable value) {`
	`432`	`+ this.setImageDrawable(value);`
`433`	`433`	`}`
`434`	`434`	`}`