Shell improve to handle deleted apps

Author: 203Null

Applications/Shell/AppLauncherPicker.h

@@ -22,7 +22,7 @@ class AppLauncherPicker : public UIComponent {
             auto application_it = applications.find(app_id);
             if(application_it == applications.end())
             {
-                MLOGE("Shell", "App ID %X not found in application list", app_id);
+                // Skip invalid app ID - should have been cleaned up on startup
                 continue;
             }
             Application_Info* application_info = application_it->second;
@@ -56,7 +56,7 @@ class AppLauncherPicker : public UIComponent {
             auto application_it = applications.find(app_id);
             if(application_it == applications.end())
             {
-                MLOGE("Shell", "App ID %X not found in application list", app_id);
+                // Skip invalid app ID - should have been cleaned up on startup
                 return false;
             }
             Application_Info* application = application_it->second;

Applications/Shell/AppLauncherPickerEditMode.h

@@ -40,7 +40,7 @@ class AppLauncherPickerEditMode : public UIComponent {
             auto application_it = applications.find(app_id);
             if(application_it == applications.end())
             {
-                MLOGE("Shell", "App ID %X not found in application list", app_id);
+                // Skip invalid app ID - should have been cleaned up on startup
                 continue;
             }
             Application_Info* application_info = application_it->second;
@@ -89,7 +89,7 @@ class AppLauncherPickerEditMode : public UIComponent {
                 auto application_it = applications.find(app_id);
                 if(application_it == applications.end())
                 {
-                    MLOGE("Shell", "App ID %X not found in application list", app_id);
+                    // Skip invalid app ID - should have been cleaned up on startup
                     return false;
                 }
                 Application_Info* application = application_it->second;
@@ -129,7 +129,7 @@ class AppLauncherPickerEditMode : public UIComponent {
                 auto application_it = applications.find(app_id);
                 if(application_it == applications.end())
                 {
-                    MLOGE("Shell", "App ID %X not found in application list", app_id);
+                    // Skip invalid app ID - should have been cleaned up on startup
                     return false;
                 }
                 Application_Info* application = application_it->second;

Applications/Shell/Shell.cpp

@@ -157,7 +157,10 @@ void Shell::InitializeFolderSystem() {
   }
   LoadFolderVector(FOLDER_HIDDEN);
   LoadFolderVector(FOLDER_INVISIBLE);
-  
+
+  // Clean up any invalid app IDs that no longer exist
+  CleanupInvalidApps();
+
   // Build a set of all apps that are already in folders
   std::unordered_set<uint32_t> apps_in_folders;
   for (auto& [folder_id, folder] : folders) {
@@ -343,6 +346,46 @@ void Shell::SaveAllFolderVectors() {
   SaveFolderVector(FOLDER_INVISIBLE);
 }
 
+void Shell::CleanupInvalidApps() {
+  bool any_changes = false;
+
+  // Clean up all folders including special ones
+  std::vector<uint8_t> all_folders;
+  for (uint8_t i = 0; i < FOLDER_COUNT; i++) {
+    all_folders.push_back(i);
+  }
+  all_folders.push_back(FOLDER_HIDDEN);
+  all_folders.push_back(FOLDER_INVISIBLE);
+
+  for (uint8_t folder_id : all_folders) {
+    std::vector<uint32_t>& app_ids = folders[folder_id].app_ids;
+    std::vector<uint32_t> valid_apps;
+
+    for (uint32_t app_id : app_ids) {
+      // Check if this app exists in the applications map
+      auto app_it = applications.find(app_id);
+      if (app_it != applications.end()) {
+        // App exists, keep it
+        valid_apps.push_back(app_id);
+      } else {
+        // App doesn't exist anymore, log and remove
+        MLOGD("Shell", "Removing invalid app ID %X from folder %d", app_id, folder_id);
+        any_changes = true;
+      }
+    }
+
+    // Update the folder with only valid apps
+    if (app_ids.size() != valid_apps.size()) {
+      app_ids = valid_apps;
+      SaveFolderVector(folder_id);
+    }
+  }
+
+  if (any_changes) {
+    MLOGI("Shell", "Cleaned up invalid app entries");
+  }
+}
+
 uint8_t Shell::GetAppFolder(uint32_t app_id, Application_Info* app_info) {
   // Check if app is invisible first
   if (!app_info->visibility) {

Applications/Shell/Shell.h

@@ -51,6 +51,7 @@ class Shell : public Application {
   void SaveFolderVector(uint8_t folder_id);
   void LoadFolderVector(uint8_t folder_id);
   void SaveAllFolderVectors();
+  void CleanupInvalidApps();
 
   // Application launcher functions
   void ApplicationLauncher();