Fix #255: make sure we can't add a null textFormat to the action list

maxme · maxme · commit a4e60da4666d · 2017-02-27T19:36:01.000+01:00
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt b/aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt
@@ -316,7 +316,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
             val actions = getSelectedActions()
             val textFormats = ArrayList<TextFormat>()
 
-            actions.forEach { if (it.isStylingAction()) textFormats.add(it.textFormat!!) }
+            actions.forEach { if (it.isStylingAction() && it.textFormat != null) textFormats.add(it.textFormat) }
             if (getSelectedHeading() != null) {
                 textFormats.add(getSelectedHeading()!!)
             }

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {`
`316`	`316`	`val actions = getSelectedActions()`
`317`	`317`	`val textFormats = ArrayList<TextFormat>()`
`318`	`318`
`319`		`- actions.forEach { if (it.isStylingAction()) textFormats.add(it.textFormat!!) }`
	`319`	`+ actions.forEach { if (it.isStylingAction() && it.textFormat != null) textFormats.add(it.textFormat) }`
`320`	`320`	`if (getSelectedHeading() != null) {`
`321`	`321`	`textFormats.add(getSelectedHeading()!!)`
`322`	`322`	`}`