From 399cf87254d36771a6b9be15860f7a72fe989dbc Mon Sep 17 00:00:00 2001 From: Julian Winkler Date: Sat, 14 Oct 2023 11:13:10 +0200 Subject: [PATCH] fix some NullPointerExceptions with Flower Finder test apk --- src/api-impl/android/graphics/Paint.java | 3 ++- src/api-impl/android/widget/TextView.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api-impl/android/graphics/Paint.java b/src/api-impl/android/graphics/Paint.java index 19615c92..c73f2395 100644 --- a/src/api-impl/android/graphics/Paint.java +++ b/src/api-impl/android/graphics/Paint.java @@ -42,7 +42,8 @@ public class Paint { if(skia_font == 0) skia_font = native_create_font(); - native_set_typeface(skia_font, typeface.skia_typeface); + if (typeface != null) + native_set_typeface(skia_font, typeface.skia_typeface); return this.typeface; } public void getTextBounds(String text, int start, int end, Rect bounds) {} diff --git a/src/api-impl/android/widget/TextView.java b/src/api-impl/android/widget/TextView.java index 1743faf1..7ae3635b 100644 --- a/src/api-impl/android/widget/TextView.java +++ b/src/api-impl/android/widget/TextView.java @@ -81,7 +81,8 @@ public class TextView extends View { native_setTextColor(color); } public void setTextColor(ColorStateList colors) { - setTextColor(colors.getDefaultColor()); // TODO: do this properly + if (colors != null) + setTextColor(colors.getDefaultColor()); // TODO: do this properly } public void setTextSize(int unit, float size) {} public void setTypeface(Typeface tf, int style) {}