From 99cd94f39f3626752fa69103eeb04bad90a78581 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 25 Jun 2023 20:35:40 +0100
Subject: [PATCH] Revert extmainapp stuff

---
 applications/services/loader/loader.c |  6 ------
 applications/services/loader/loader.h |  2 --
 scripts/fbt/appmanifest.py            | 19 +++++--------------
 scripts/fbt_tools/fbt_extapps.py      |  2 +-
 site_scons/extapps.scons              |  1 -
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/applications/services/loader/loader.c b/applications/services/loader/loader.c
index 7652f9a89..9c59e9ca9 100644
--- a/applications/services/loader/loader.c
+++ b/applications/services/loader/loader.c
@@ -215,12 +215,6 @@ static void
     loader_start_internal_app(Loader* loader, const FlipperApplication* app, const char* args) {
     FURI_LOG_I(TAG, "Starting %s", app->name);
 
-    if(app->app == NULL) {
-        args = app->appid;
-        app = loader_find_application_by_name_in_list(
-            FAP_LOADER_APP_NAME, FLIPPER_APPS, FLIPPER_APPS_COUNT);
-    }
-
     // store args
     furi_assert(loader->app.args == NULL);
     if(args && strlen(args) > 0) {
diff --git a/applications/services/loader/loader.h b/applications/services/loader/loader.h
index b31bb1bdd..7f4e2ec89 100644
--- a/applications/services/loader/loader.h
+++ b/applications/services/loader/loader.h
@@ -8,8 +8,6 @@ extern "C" {
 
 #define RECORD_LOADER "loader"
 
-#define FAP_LOADER_APP_NAME "Apps"
-
 typedef struct Loader Loader;
 
 typedef enum {
diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py
index 531df8bc1..e4967a2ad 100644
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -20,7 +20,6 @@ class FlipperAppType(Enum):
     EXTERNAL = "External"
     METAPACKAGE = "Package"
     PLUGIN = "Plugin"
-    EXTMAINAPP = "ExtMainApp"
 
 
 @dataclass
@@ -375,14 +374,6 @@ class ApplicationsCGenerator:
     def get_app_descr(self, app: FlipperApplication):
         if app.apptype == FlipperAppType.STARTUP:
             return app.entry_point
-        if app.apptype == FlipperAppType.EXTMAINAPP:
-            return f"""
-    {{.app = NULL,
-     .name = "{app.name}",
-     .appid = "/ext/apps/.Main/{app.appid}.fap",
-     .stack_size = 0,
-     .icon = {f"&{app.icon}" if app.icon else "NULL"},
-     .flags = {'|'.join(f"FlipperApplicationFlag{flag}" for flag in app.flags)}}}"""
         return f"""
     {{.app = {app.entry_point},
      .name = "{app.name}",
@@ -403,11 +394,11 @@ class ApplicationsCGenerator:
             )
             entry_type, entry_block = self.APP_TYPE_MAP[apptype]
             contents.append(f"const {entry_type} {entry_block}[] = {{")
-            apps = self.buildset.get_apps_of_type(apptype)
-            if apptype is FlipperAppType.APP:
-                apps += self.buildset.get_apps_of_type(FlipperAppType.EXTMAINAPP)
-            apps.sort(key=lambda app: app.order)
-            contents.append(",\n".join(map(self.get_app_descr, apps)))
+            contents.append(
+                ",\n".join(
+                    map(self.get_app_descr, self.buildset.get_apps_of_type(apptype))
+                )
+            )
             contents.append("};")
             contents.append(
                 f"const size_t {entry_block}_COUNT = COUNT_OF({entry_block});"
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 2a16558fc..3ad3fbda8 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -179,7 +179,7 @@ class AppBuilder:
                         deployable = False
                 app_artifacts.dist_entries.append((deployable, fal_path))
         else:
-            fap_path = f"apps/{'.Main' if self.app.apptype == FlipperAppType.EXTMAINAPP else self.app.fap_category}/{app_artifacts.compact.name}"
+            fap_path = f"apps/{self.app.fap_category}/{app_artifacts.compact.name}"
             app_artifacts.dist_entries.append(
                 (self.app.is_default_deployable, fap_path)
             )
diff --git a/site_scons/extapps.scons b/site_scons/extapps.scons
index 946844870..6db0e538d 100644
--- a/site_scons/extapps.scons
+++ b/site_scons/extapps.scons
@@ -67,7 +67,6 @@ class FlipperExtAppBuildArtifacts:
 apps_to_build_as_faps = [
     FlipperAppType.PLUGIN,
     FlipperAppType.EXTERNAL,
-    FlipperAppType.EXTMAINAPP,
     FlipperAppType.DEBUG,
 ]