fix: crash when selecting/closing file (fixes #1498) (#1507)

AndroidIDEOfficial · Dec 1, 2023 · 1f38006 · 1f38006
1 parent 8ac221c
commit 1f38006
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt b/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt
@@ -183,7 +183,7 @@ interface ActionItem {
     }
 
     fun forId(id: String): Location {
-      return values().first { it.id == id }
+      return entries.first { it.id == id }
     }
   }
 }
diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
@@ -348,10 +348,8 @@ open class EditorHandlerActivity : ProjectHandlerActivity(), IEditorHandler {
 
   override fun getEditorForFile(file: File): CodeEditorView? {
     for (i in 0 until editorViewModel.getOpenedFileCount()) {
-      val editor = binding.editorContainer.getChildAt(i) as CodeEditorView
-      if (file == editor.file) {
-        return editor
-      }
+      val editor = binding.editorContainer.getChildAt(i) as? CodeEditorView
+      if (file == editor?.file) return editor
     }
     return null
   }