fix: do not perform code action if the activity is being destroyed (f…

…ixes #950)
AndroidIDEOfficial · May 27, 2023 · 30b3946 · 30b3946
1 parent 96340f8
commit 30b3946
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt
@@ -142,14 +142,14 @@ abstract class ProjectHandlerActivity : BaseEditorActivity(), IProjectHandler {
       closeProject(false)
     }
 
+    if (IDELanguageClientImpl.isInitialized()) {
+      IDELanguageClientImpl.shutdown()
+    }
+
     super.preDestroy()
 
     if (isDestroying) {
 
-      if (IDELanguageClientImpl.isInitialized()) {
-        IDELanguageClientImpl.shutdown()
-      }
-
       try {
         stopLanguageServers()
       } catch (err: Exception) {

diff --git a/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java b/app/src/main/java/com/itsaky/androidide/lsp/IDELanguageClientImpl.java
@@ -170,6 +170,7 @@ public void performCodeAction(PerformCodeActionParams params) {
     }
 
     final var action = params.getAction();
+    final var activity = activity();
     if (activity() == null) {
       LOG.error(
           "Unable to perform code action",
@@ -179,6 +180,15 @@ public void performCodeAction(PerformCodeActionParams params) {
       return;
     }
 
+    if (activity.isFinishing()
+      || activity.isDestroyed()
+      || activity.getSupportFragmentManager().isDestroyed()
+      || activity.getSupportFragmentManager().isStateSaved()) {
+      LOG.error("Cannot perform code action. Activity is in an invalid state.");
+      // Should we try to show the error message to the user?
+      return;
+    }
+
     final var currentEditor = activity().getCurrentEditor();
     final var editor = currentEditor != null ? currentEditor.getEditor() : null;