Merge pull request #351 from webOS-ports/herrie/fix-appid

AppMenu.qml: Make sure to set the correct title of the app.
webOS-ports · Nov 22, 2023 · b6f8050 · b6f8050
2 parents 7e67c8f + 61b8153
commit b6f8050
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/qml/StatusBar/AppMenu.qml b/qml/StatusBar/AppMenu.qml
@@ -38,7 +38,7 @@ Item {
         // now, if the appId is valid, fetch the app name
         if (activeWindowAppId.length > 0) {
             service.call("luna://com.webos.service.applicationManager/getAppInfo",
-                         JSON.stringify({"appId":activeWindowAppId}),
+                         JSON.stringify({"id":activeWindowAppId}),
                          handleGetAppInfoResponse, handleGetAppInfoError);
         }
         else
@@ -55,10 +55,11 @@ Item {
 
     function determineActiveWindowAppId() {
         var appId = "";
-        if (launcherInstance.state === "justTypeLauncher")
+        if (launcherInstance.state === "justTypeLauncher") {
             appId = "com.palm.launcher";
-        else
-            appId = cardViewInstance.getAppIdForFocusApplication();
+        } else {
+            appId = cardViewInstance.getAppIdForFocusApplication(); 
+        }
         return appId;
     }
 
@@ -77,10 +78,11 @@ Item {
 
     function handleGetAppInfoResponse(message) {
         var response = JSON.parse(message.payload);
-        if (response.returnValue && response.appInfo && response.appInfo.appmenu)
-            activeWindowTitle = response.appInfo.appmenu;
-        else
+        if (response.returnValue && response.appInfo && (response.appInfo.appmenu || response.appInfo.title)) {
+            activeWindowTitle = response.appInfo.appmenu ? response.appInfo.appmenu : response.appInfo.title;
+        } else {
             activeWindowTitle = defaultAppMenuTitle;
+        }
     }
 
     function handleGetAppInfoError(error) {