Skip to content

Address NullPointerException crash in AztecHeadingSpan #1071

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
SiobhyB merged 1 commit into from
Dec 4, 2023
Merged

Address NullPointerException crash in AztecHeadingSpan #1071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecHeadingSpan.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ open class AztecHeadingSpan(
// save original font metrics
if (previousFontMetrics == null) {
previousFontMetrics = Paint.FontMetricsInt()
previousFontMetrics!!.top = fm.top
previousFontMetrics!!.ascent = fm.ascent
previousFontMetrics!!.bottom = fm.bottom
previousFontMetrics!!.descent = fm.descent
previousFontMetrics?.top = fm.top
previousFontMetrics?.ascent = fm.ascent
previousFontMetrics?.bottom = fm.bottom
previousFontMetrics?.descent = fm.descent
}

var addedTopPadding = false
Expand All @@ -151,13 +151,17 @@ open class AztecHeadingSpan(

// apply original font metrics to lines that should not have vertical padding
if (!addedTopPadding) {
fm.ascent = previousFontMetrics!!.ascent
fm.top = previousFontMetrics!!.top
previousFontMetrics?.let {
fm.ascent = it.ascent
fm.top = it.top
}
}

if (!addedBottomPadding) {
fm.descent = previousFontMetrics!!.descent
fm.bottom = previousFontMetrics!!.bottom
previousFontMetrics?.let {
fm.descent = it.descent
fm.bottom = it.bottom
}
}
}

Expand Down