fix: handle cases where editor might be null when RedoAction is execu…

…ted (fixes #1318)
AndroidIDEOfficial · Sep 18, 2023 · 2a306e8 · 2a306e8
1 parent ace83d5
commit 2a306e8
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/app/src/main/java/com/itsaky/androidide/actions/text/RedoAction.kt b/app/src/main/java/com/itsaky/androidide/actions/text/RedoAction.kt
@@ -25,6 +25,7 @@ import com.blankj.utilcode.util.KeyboardUtils
 import com.itsaky.androidide.resources.R
 import com.itsaky.androidide.actions.ActionData
 import com.itsaky.androidide.actions.EditorRelatedAction
+import com.itsaky.androidide.actions.markInvisible
 
 /** @author Akash Yadav */
 class RedoAction(context: Context, override val order: Int) : EditorRelatedAction() {
@@ -43,12 +44,20 @@ class RedoAction(context: Context, override val order: Int) : EditorRelatedActio
       return
     }
 
-    val editor = getEditor(data)!!
+    val editor = getEditor(data) ?: run {
+      markInvisible()
+      return
+    }
+
     enabled = editor.canRedo()
   }
 
   override fun execAction(data: ActionData): Boolean {
-    val editor = getEditor(data)!!
+    val editor = getEditor(data) ?: run {
+      markInvisible()
+      return false
+    }
+
     editor.redo()
     data.getActivity()?.invalidateOptionsMenu()
     return true