Fix and simplify Activity.appFullName propagation

ThomasFarstrike · ThomasFarstrike · commit 368462f1a503 · 2026-04-14T20:40:03.000+02:00
diff --git a/internal_filesystem/lib/mpos/activity_navigator.py b/internal_filesystem/lib/mpos/activity_navigator.py
@@ -11,7 +11,7 @@ def get_foreground_app():
     if mpos.ui.screen_stack:
         current_activity, _, _, _ = mpos.ui.screen_stack[-1]
         if current_activity:
-            return getattr(current_activity, "appFullName", None)
+            return current_activity.appFullName
     return None
 
 
diff --git a/internal_filesystem/lib/mpos/app/activity.py b/internal_filesystem/lib/mpos/app/activity.py
@@ -32,16 +32,12 @@ def setContentView(self, screen):
 
     def startActivity(self, intent):
         from mpos.activity_navigator import ActivityNavigator
-        app_fullname = getattr(self, "appFullName", None)
-        if app_fullname is not None:
-            intent.app_fullname = app_fullname
+        intent.app_fullname = self.appFullName
         ActivityNavigator.startActivity(intent)
 
     def startActivityForResult(self, intent, result_callback):
         from mpos.activity_navigator import ActivityNavigator
-        app_fullname = getattr(self, "appFullName", None)
-        if app_fullname is not None:
-            intent.app_fullname = app_fullname
+        intent.app_fullname = self.appFullName
         ActivityNavigator.startActivityForResult(intent, result_callback)
 
     def initError(self, e):
diff --git a/internal_filesystem/lib/mpos/content/app_manager.py b/internal_filesystem/lib/mpos/content/app_manager.py
@@ -252,7 +252,7 @@ def is_installed_by_name(app_fullname):
         return AppManager.is_installed_by_path(f"apps/{app_fullname}") or AppManager.is_installed_by_path(f"builtin/apps/{app_fullname}")
 
     @staticmethod
-    def execute_script(script_source, is_file, classname, cwd=None):
+    def execute_script(script_source, is_file, classname, cwd=None, app_fullname=None):
         """Run the script in the current thread. Returns True if successful."""
         import utime # for timing read and compile
         import lvgl as lv
@@ -297,13 +297,14 @@ def execute_script(script_source, is_file, classname, cwd=None):
                 print("Variables:", variables.keys())
                 main_activity = script_globals.get(classname)
                 if main_activity:
-                    from ..app.activity import Activity
+                    from mpos.activity_navigator import ActivityNavigator
                     from .intent import Intent
-                    from mpos.activity_navigator import get_foreground_app
                     start_time = utime.ticks_ms()
-                    Activity.startActivity(None, Intent(activity_class=main_activity, app_fullname=get_foreground_app()))
+                    ActivityNavigator.startActivity(
+                        Intent(activity_class=main_activity, app_fullname=app_fullname)
+                    )
                     end_time = utime.ticks_diff(utime.ticks_ms(), start_time)
-                    print(f"execute_script: Activity.startActivity took {end_time}ms")
+                    print(f"execute_script: ActivityNavigator.startActivity took {end_time}ms")
                 else:
                     print(f"Warning: could not find app's main_activity {classname}")
                     return False
@@ -341,7 +342,13 @@ def start_app(fullname):
         else:
             entrypoint = app.main_launcher_activity.get('entrypoint')
             classname = app.main_launcher_activity.get("classname")
-        result = AppManager.execute_script(app.installed_path + "/" + entrypoint, True, classname, app.installed_path + "/assets/")
+        result = AppManager.execute_script(
+            app.installed_path + "/" + entrypoint,
+            True,
+            classname,
+            app.installed_path + "/assets/",
+            app_fullname=fullname,
+        )
         # Launchers have the bar, other apps don't have it
         import mpos.ui
         if app.is_valid_launcher():
diff --git a/internal_filesystem/lib/mpos/testing/mocks.py b/internal_filesystem/lib/mpos/testing/mocks.py
@@ -886,7 +886,7 @@ def restart_launcher():
         return True
     
     @staticmethod
-    def execute_script(script_source, is_file, classname, cwd=None):
+    def execute_script(script_source, is_file, classname, cwd=None, app_fullname=None):
         """Mock execute_script function."""
         return True
 
@@ -910,7 +910,7 @@ def restart_launcher():
         return True
     
     @staticmethod
-    def execute_script(script_source, is_file, classname, cwd=None):
+    def execute_script(script_source, is_file, classname, cwd=None, app_fullname=None):
         """Mock execute_script function."""
         return True
 
diff --git a/internal_filesystem/lib/mpos/ui/topmenu.py b/internal_filesystem/lib/mpos/ui/topmenu.py
@@ -48,6 +48,7 @@ def close_drawer(to_launcher=False):
         from mpos.activity_navigator import get_foreground_app
         drawer_open=False
         fg = get_foreground_app()
+        print(f"topmenu.py foreground app: {fg}")
         if not to_launcher and fg is not None and not "launcher" in fg:
             print(f"close_drawer: also closing bar because to_launcher is {to_launcher} and foreground_app_name is {get_foreground_app()}")
             close_bar(False)
diff --git a/tests/test_graphical_foreground_app.py b/tests/test_graphical_foreground_app.py
@@ -0,0 +1,49 @@
+"""
+Graphical test to verify get_foreground_app returns the active app.
+"""
+
+import time
+import unittest
+
+from mpos import AppManager
+from mpos.ui import get_foreground_app
+from mpos.ui.testing import wait_for_render
+
+
+class TestForegroundApp(unittest.TestCase):
+    """Ensure get_foreground_app tracks the top activity in the UI stack."""
+
+    def _wait_for_foreground(self, expected, timeout_ms=2500):
+        start = time.ticks_ms()
+        while time.ticks_diff(time.ticks_ms(), start) < timeout_ms:
+            fg = get_foreground_app()
+            if fg == expected:
+                return True
+            wait_for_render(iterations=10)
+        return False
+
+    def test_get_foreground_app_after_starting_apps(self):
+        launcher_fullname = "com.micropythonos.launcher"
+        about_fullname = "com.micropythonos.about"
+
+        AppManager.start_app(launcher_fullname)
+        wait_for_render(iterations=30)
+        self.assertTrue(
+            self._wait_for_foreground(launcher_fullname),
+            f"Expected foreground app to be {launcher_fullname}, got {get_foreground_app()}",
+        )
+
+        AppManager.start_app(about_fullname)
+        wait_for_render(iterations=30)
+        self.assertTrue(
+            self._wait_for_foreground(about_fullname),
+            f"Expected foreground app to be {about_fullname}, got {get_foreground_app()}",
+        )
+
+        fg = get_foreground_app()
+        self.assertIsNotNone(fg, "Foreground app should not be None after start_app")
+        self.assertEqual(
+            fg,
+            about_fullname,
+            f"Foreground app mismatch: expected {about_fullname}, got {fg}",
+        )
