Merge pull request #898 from wordpress-mobile/crash-media-unavailable

Crash Media Unavailable

Author: maxme

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.3.39](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.39)
+### Fixed
+- Move media button initialization to avoid crash when advanced toolbar is enabled and media button is disabled
+
 ## [1.3.38](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.38)
 ### Fixed
 - When text changes, only disable selection listener if text is empty

README.md

@@ -105,7 +105,7 @@ repositories {
 ```
 ```gradle
 dependencies {
-    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.38')
+    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.39')
 }
 ```
 

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

@@ -5,8 +5,6 @@ import android.content.Context
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
-import androidx.core.text.TextUtilsCompat
-import androidx.core.view.ViewCompat
 import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -23,6 +21,8 @@ import android.widget.PopupMenu.OnMenuItemClickListener
 import android.widget.Toast
 import android.widget.ToggleButton
 import androidx.appcompat.app.AlertDialog
+import androidx.core.text.TextUtilsCompat
+import androidx.core.view.ViewCompat
 import org.wordpress.android.util.AppLog
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.AztecText.EditorHasChanges.NO_CHANGES
@@ -33,8 +33,8 @@ import org.wordpress.aztec.plugins.IMediaToolbarButton
 import org.wordpress.aztec.plugins.IToolbarButton
 import org.wordpress.aztec.source.SourceViewEditText
 import org.wordpress.aztec.util.convertToButtonAccessibilityProperties
-import java.util.Arrays
 import java.util.ArrayList
+import java.util.Arrays
 import java.util.Locale
 
 /**
@@ -819,12 +819,12 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
     private fun setupMediaToolbar() {
         val mediaToolbarContainer : LinearLayout = findViewById(R.id.media_button_container)
         mediaToolbarContainer.visibility = if (isMediaToolbarAvailable) View.VISIBLE else View.GONE
+        buttonMediaCollapsed = findViewById(R.id.format_bar_button_media_collapsed)
         if (!isMediaToolbarAvailable) return
 
         mediaToolbar = findViewById(R.id.media_toolbar)
         stylingToolbar = findViewById(R.id.styling_toolbar)
 
-        buttonMediaCollapsed = findViewById(R.id.format_bar_button_media_collapsed)
         buttonMediaExpanded = findViewById(R.id.format_bar_button_media_expanded)
 
         if (isMediaToolbarVisible) {