fix(android): NPE fix

nativescript-community · May 28, 2020 · 079ab05 · 079ab05
1 parent e88a037
commit 079ab05
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/plugin/platforms/android/java/com/nativescript/label/HtmlToSpannedConverter.java b/plugin/platforms/android/java/com/nativescript/label/HtmlToSpannedConverter.java
@@ -36,6 +36,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import android.util.Log;
+
 class HtmlToSpannedConverter extends DefaultHandler {
     private final String TAG = "HtmlToSpannedConverter";
 
@@ -479,7 +481,7 @@ private Object getStyleSpan(Attributes attr) {
                         needsFontSpan = true;
                         break;
                     case "font-size":
-                        fontSize = Float.parseFloat(value.replace("px", "").replace("pt", ""));
+                        fontSize = Float.parseFloat(value.replace("px", "").replace("pt", "").trim()) * density;
                         needsFontSpan = true;
                         break;
                     case "font-weight":
@@ -504,16 +506,16 @@ private Object getStyleSpan(Attributes attr) {
 
                 }
                 if (needsFontSpan) {
-                    boolean isBold = fontWeight != null && fontWeight.equals("bold") || fontWeight.equals("700");
+                    boolean isBold = fontWeight != null && (fontWeight.equals("bold") || fontWeight.equals("700"));
                     if (fontFamily != null) {
                         result.add(new CustomTypefaceSpan(fontFamily, Font.createTypeface(this.context, this.fontFolder, fontFamily, fontWeight, isBold, false)));
                     } else {
-                        if (fontWeight.equals("bold") || fontWeight.equals("700")) {
+                        if (isBold) {
                             result.add(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD));
                         }
                     }
                     if (fontSize != 0) {
-                        result.add(new AbsoluteSizeSpan(Math.round(fontSize * density)));
+                        result.add(new AbsoluteSizeSpan(Math.round(fontSize)));
                     }
                     if (color != null) {
                         result.add(new ForegroundColorSpan(Color.parseColor(color)));