Skip to content

Revert PR #33045: [Android] Image control crashes on Android when image width exceeds height #33413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PureWeen merged 3 commits into from
Jan 7, 2026
Merged

Revert PR #33045: [Android] Image control crashes on Android when image width exceeds height #33413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf2ab68
Initial plan
Copilot Jan 7, 2026
7d755ed
Revert PR #33045: [Android] Image control crashes on Android when ima…
Copilot Jan 7, 2026
4ebe346
Restore original build report file
Copilot Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed src/Controls/tests/TestCases.Android.Tests/snapshots/android/Issue32869_Image.png
View file
Open in desktop
Binary file not shown.
49 changes: 0 additions & 49 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue32869.cs
View file
Open in desktop

This file was deleted.

Binary file removed src/Controls/tests/TestCases.HostApp/Resources/Raw/Issue32869.png
View file
Open in desktop
Binary file not shown.
22 changes: 0 additions & 22 deletions src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue32869.cs
View file
Open in desktop

This file was deleted.

Binary file removed src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/Issue32869_Image.png
View file
Open in desktop
Binary file not shown.
35 changes: 8 additions & 27 deletions src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,6 @@ static PorterDuff.Mode getPorterMode(int mode) {
}

private static void prepare(RequestBuilder<Drawable> builder, MauiTarget target, boolean cachingEnabled, ImageLoaderCallback callback) {
prepare(builder, target, cachingEnabled, callback, false);
}

private static void prepare(RequestBuilder<Drawable> builder, MauiTarget target, boolean cachingEnabled, ImageLoaderCallback callback, boolean constrainSize) {
// A special value to work around https://github.com/dotnet/maui/issues/6783 where targets
// are actually re-used if all the variables are the same.
// Adding this "error image" that will always load a null image makes each request unique,
Expand All @@ -314,13 +310,6 @@ private static void prepare(RequestBuilder<Drawable> builder, MauiTarget target,
.skipMemoryCache(true);
}

// Constrain bitmap size to prevent excessive memory allocation
// See https://github.com/dotnet/maui/issues/32869
if (constrainSize) {
builder = builder
.override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL);
}

target.load(builder);
}

Expand All @@ -329,28 +318,20 @@ public static String getGlyphHex(String glyph) {
}

private static void loadInto(RequestBuilder<Drawable> builder, ImageView imageView, boolean cachingEnabled, ImageLoaderCallback callback, Object model) {
loadInto(builder, imageView, cachingEnabled, callback, model, false);
}

private static void loadInto(RequestBuilder<Drawable> builder, ImageView imageView, boolean cachingEnabled, ImageLoaderCallback callback, Object model, boolean constrainSize) {
MauiCustomViewTarget target = new MauiCustomViewTarget(imageView, callback, model);
prepare(builder, target, cachingEnabled, callback, constrainSize);
prepare(builder, target, cachingEnabled, callback);
}

private static void load(RequestBuilder<Drawable> builder, Context context, boolean cachingEnabled, ImageLoaderCallback callback, Object model) {
load(builder, context, cachingEnabled, callback, model, false);
}

private static void load(RequestBuilder<Drawable> builder, Context context, boolean cachingEnabled, ImageLoaderCallback callback, Object model, boolean constrainSize) {
MauiCustomTarget target = new MauiCustomTarget(context, callback, model);
prepare(builder, target, cachingEnabled, callback, constrainSize);
prepare(builder, target, cachingEnabled, callback);
}

public static void loadImageFromFile(ImageView imageView, String file, ImageLoaderCallback callback) {
RequestBuilder<Drawable> builder = Glide
.with(imageView)
.load(file);
loadInto(builder, imageView, true, callback, file, true);
loadInto(builder, imageView, true, callback, file);
}

public static void loadImageFromUri(ImageView imageView, String uri, boolean cachingEnabled, ImageLoaderCallback callback) {
Expand All @@ -362,14 +343,14 @@ public static void loadImageFromUri(ImageView imageView, String uri, boolean cac
RequestBuilder<Drawable> builder = Glide
.with(imageView)
.load(androidUri);
loadInto(builder, imageView, cachingEnabled, callback, androidUri, true);
loadInto(builder, imageView, cachingEnabled, callback, androidUri);
}

public static void loadImageFromStream(ImageView imageView, InputStream inputStream, ImageLoaderCallback callback) {
RequestBuilder<Drawable> builder = Glide
.with(imageView)
.load(inputStream);
loadInto(builder, imageView, false, callback, inputStream, true);
loadInto(builder, imageView, false, callback, inputStream);
}

public static void loadImageFromFont(ImageView imageView, @ColorInt int color, String glyph, Typeface typeface, float textSize, ImageLoaderCallback callback) {
Expand All @@ -385,7 +366,7 @@ public static void loadImageFromFile(Context context, String file, ImageLoaderCa
RequestBuilder<Drawable> builder = Glide
.with(context)
.load(file);
load(builder, context, true, callback, file, true);
load(builder, context, true, callback, file);
}

public static void loadImageFromUri(Context context, String uri, boolean cachingEnabled, ImageLoaderCallback callback) {
Expand All @@ -397,14 +378,14 @@ public static void loadImageFromUri(Context context, String uri, boolean caching
RequestBuilder<Drawable> builder = Glide
.with(context)
.load(androidUri);
load(builder, context, cachingEnabled, callback, androidUri, true);
load(builder, context, cachingEnabled, callback, androidUri);
}

public static void loadImageFromStream(Context context, InputStream inputStream, ImageLoaderCallback callback) {
RequestBuilder<Drawable> builder = Glide
.with(context)
.load(inputStream);
load(builder, context, false, callback, inputStream, true);
load(builder, context, false, callback, inputStream);
}

public static void loadImageFromFont(Context context, @ColorInt int color, String glyph, Typeface typeface, float textSize, ImageLoaderCallback callback) {
Expand Down
Loading