Solved Auto-loading project from Trash mit-cml#3208

d1vyanshu-kumar · Jan 14, 2025 · 3544839 · 3544839
1 parent d3c9457
commit 3544839
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/appinventor/appengine/src/com/google/appinventor/client/Ode.java b/appinventor/appengine/src/com/google/appinventor/client/Ode.java
@@ -554,8 +554,17 @@ private void openPreviousProject() {
       return;
     }
     final String value = userSettings.getSettings(SettingsConstants.USER_GENERAL_SETTINGS)
-        .getPropertyValue(SettingsConstants.GENERAL_SETTINGS_CURRENT_PROJECT_ID);
-    openProject(value);
+            .getPropertyValue(SettingsConstants.GENERAL_SETTINGS_CURRENT_PROJECT_ID);
+    if (value.isEmpty()) {
+      switchToProjectsView();
+      return;
+    }
+    long projectId = Long.parseLong(value);
+    if (projectManager.isProjectInTrash(projectId)) {
+      switchToProjectsView();
+    } else {
+      openProject(value);
+    }
   }
 
   private void openProject(String projectIdString) {

diff --git a/appinventor/appengine/src/com/google/appinventor/client/explorer/project/ProjectManager.java b/appinventor/appengine/src/com/google/appinventor/client/explorer/project/ProjectManager.java
@@ -239,4 +239,9 @@ private void fireProjectDeleted(Project project) {
       listener.onProjectDeleted(project);
     }
   }
+
+  public boolean isProjectInTrash(long projectId) {
+    Project project = projectsMap.get(projectId);
+    return project != null && project.isInTrash();
+  }
 }