@sapui5/sap.ushell 1.120.8 → 1.121.0

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,9 +1,11 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.120.8
+ * @version 1.121.0
  */
 sap.ui.define([
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ushell/components/applicationIntegration/elements/model",
     "sap/ushell/components/applicationIntegration/Storage",
     "sap/ushell/components/applicationIntegration/application/BlueBoxHandler",
@@ -16,7 +18,6 @@ sap.ui.define([
     "sap/ushell/components/applicationIntegration/configuration/AppMeta",
     "sap/ushell/services/AppConfiguration",
     "sap/ushell/utils",
-    "sap/ui/Device",
     "sap/ushell/Config",
     "sap/ushell/ApplicationType",
     "sap/base/util/deepExtend",
@@ -29,8 +30,11 @@ sap.ui.define([
     "sap/ui/thirdparty/hasher",
     "sap/ushell/services/_MessageBroker/MessageBrokerEngine",
     "sap/ushell/renderer/utils",
-    "sap/m/library"
+    "sap/m/library",
+    "sap/ushell/Container"
 ], function (
+    Element,
+    EventBus,
     ElementsModel,
     Storage,
     BlueBoxHandler,
@@ -43,7 +47,6 @@ sap.ui.define([
     AppMeta,
     AppConfiguration,
     utils,
-    Device,
     Config,
     ApplicationType,
     deepExtend,
@@ -56,7 +59,8 @@ sap.ui.define([
     hasher,
     MessageBrokerEngine,
     RendererUtils,
-    mobileLibrary
+    mobileLibrary,
+    Container
 ) {
     "use strict";
 
@@ -260,6 +264,7 @@ sap.ui.define([
             if (oStorageEntry && oStorageEntry.stateStored === true) {
                 Application.restore(oStorageEntry);
                 RelatedServices.restore(oStorageEntry.service);
+                this.setBackNavigationChanged(true);
                 AppMeta.restore();
             }
         };
@@ -277,14 +282,13 @@ sap.ui.define([
 
             if (Storage.get(sActualAppFromId)) {
                 if ((RelatedServices.isBackNavigation() === true && !isHomePage) || (bForceCloseApp === true)) {
-                    Core.getEventBus().publish("sap.ushell", "appClosed", oFrom);
+                    EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
                     Storage.removeById(sActualAppFromId);
                     return BlueBoxHandler.statefulDestroyApp(oFrom);
-                } else {
-                    // in this case the store of the currently running application, so we do not need to pass the sCacheId
-                    Core.getEventBus().publish("sap.ushell", "appClosed", oFrom);
-                    return BlueBoxHandler.statefulStoreKeepAliveApp(oFrom, sActualAppFromId);
                 }
+                // in this case the store of the currently running application, so we do not need to pass the sCacheId
+                EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
+                return BlueBoxHandler.statefulStoreKeepAliveApp(oFrom, sActualAppFromId);
             }
             // in this case the destroy of the currently running application, so we do not need to pass the sCacheId
             return BlueBoxHandler.statefulDestroyApp(oFrom);
@@ -329,7 +333,7 @@ sap.ui.define([
                     } else {
                         this.store(sFromId);
                     }
-                    Core.getEventBus().publish("sap.ushell", "appClosed", oFrom);
+                    EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
                 } else if (oFrom.getStatefulType && oFrom.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
                     if (isHomePage) {
                         oPromiseAppClose = PostMessageUtils.postMessageToIframeApp(oFrom, "sap.gui", "triggerCloseSessionImmediately");
@@ -358,11 +362,11 @@ sap.ui.define([
 
                 //handle the case of appFiner
                 if (sFromId.indexOf("Shell-appfinder-component") > 0) {
-                    Core.getEventBus().publish("sap.ushell", "appFinderAfterNavigate");
+                    EventBus.getInstance().publish("sap.ushell", "appFinderAfterNavigate");
                 }
             }
 
-            Core.getEventBus().publish("relatedServices", "resetBackNavigation");
+            EventBus.getInstance().publish("relatedServices", "resetBackNavigation");
 
             if (oPromiseAppClose === undefined) {
                 oPromiseAppClose = new jQuery.Deferred().resolve().promise();
@@ -465,24 +469,6 @@ sap.ui.define([
             return false;
         };
 
-        this.changeAppKeepAliveStatus = function (oContainer, oEventData) {
-            var oCurrentHash, sCurrAppId;
-
-            if (utils.isSAPLegacyApplicationType(oContainer.getApplicationType(), oContainer.getFrameworkId()) &&
-                    oEventData.bKeepAlive === true && oContainer.getIsKeepAlive() === false) {
-                oCurrentHash = oUrlParsing.parseShellHash(hasher.getHash());
-                sCurrAppId = "application-" + oCurrentHash.semanticObject + "-" + oCurrentHash.action;
-                if (!Storage.get(sCurrAppId) && BlueBoxHandler.changeAppContainerToKeepAlive(oContainer)) {
-                    this.storeApp(sCurrAppId,
-                        oContainer,
-                        oContainer.getCurrentAppTargetResolution(),
-                        hasher.getHash(), {
-                            paramValue: oKeepAliveModes.RESTRICTED
-                        });
-                }
-            }
-        };
-
         this.isAppOfTypeCached = function (appId, bIsAppOfTypeCachable, oKeepAliveMode) {
             var sKeepAlive;
 
@@ -554,7 +540,7 @@ sap.ui.define([
             return oTarget.applicationType;
         };
 
-        this.reloadCurrentApp = function(oData) {
+        this.reloadCurrentApp = function (oData) {
             var oTmpAppContainer = BlueBoxHandler.getBlueBoxById(oData.sAppContainerId);
             if (oTmpAppContainer) {
                 var sTmpUrl = oTmpAppContainer.getUrl();
@@ -563,9 +549,9 @@ sap.ui.define([
                 this.destroyApplication(oData.sAppContainerId, oTmpAppContainer);
                 BlueBoxHandler.deleteBlueBoxByUrl(sTmpUrl);
             }
-            sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigation) {
+            Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
                 try {
-                    oShellNavigation.hashChanger.treatHashChanged(oData.sCurrentHash);
+                    oShellNavigationInternal.hashChanger.treatHashChanged(oData.sCurrentHash);
                 } catch (error) {
                     Log.error("Error when trying to re-load the current displayed application", error, "sap.ushell.services.AppLifeCycle");
                 }
@@ -709,7 +695,7 @@ sap.ui.define([
         /**
          * Any event one wishes to subscribe to during the AppLifeCycle.init() call should be added here.
          * Events will only be added the first time AppLifeCycle.init() is called.
-         * */
+         */
         this.addEvents = (function () {
             var hasBeenCalled = false;
             return function () {
@@ -737,8 +723,8 @@ sap.ui.define([
         }());
 
         this.init = function (inAppState, oInViewPortContainer, inSRootIntent, inDisableHomeAppCache, oShellUIServiceChange, aActions) {
-            if (sap.ushell && sap.ushell.Container && Config.last("/core/shell/enablePersistantAppstateWhenSharing")) {
-                sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
+            if (Container && Config.last("/core/shell/enablePersistantAppstateWhenSharing")) {
+                Container.getServiceAsync("AppState").then(function (oAppStateService) {
                     fnOldTriggerEmail = URLHelper.triggerEmail.bind(URLHelper);
                     URLHelper.triggerEmail = function (sTo, sSubject, sBody, sCc, sBcc) {
                         var sFLPUrl = document.URL;
@@ -815,21 +801,21 @@ sap.ui.define([
                                             oServiceParams.oContainer.setProperty("statefulType", -BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
                                         } else {
                                             arrCap.push({
-                                                "action": "create",
-                                                "service": "sap.ushell.services.AppLifeCycle"
+                                                action: "create",
+                                                service: "sap.ushell.services.AppLifeCycle"
                                             });
                                             arrCap.push({
-                                                "action": "destroy",
-                                                "service": "sap.ushell.services.AppLifeCycle"
+                                                action: "destroy",
+                                                service: "sap.ushell.services.AppLifeCycle"
                                             });
                                             oServiceParams.oContainer.setProperty("statefulType", BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
                                         }
                                     }
                                     if (oSetup.isIframeValid === true) {
-                                        arrCap.push({"action":"iframeIsValid","service":"sap.ushell.appRuntime"});
+                                        arrCap.push({action: "iframeIsValid", service: "sap.ushell.appRuntime"});
                                     }
                                     if (oSetup.session && oSetup.session.bLogoutSupport === true) {
-                                        arrCap.push({"action":"logout","service":"sap.ushell.sessionHandler"});
+                                        arrCap.push({action: "logout", service: "sap.ushell.sessionHandler"});
                                     }
                                     if (arrCap.length > 0) {
                                         BlueBoxHandler.addCapabilities(oServiceParams.oContainer, arrCap);
@@ -865,15 +851,15 @@ sap.ui.define([
             });
 
             //TODO add unsubscribe
-            Core.getEventBus().subscribe("sap.ushell", "appComponentLoaded", this.onComponentCreated, this);
-            Core.getEventBus().subscribe("sap.ushell", "getAppLifeCycle", this.onGetMe, this);
+            EventBus.getInstance().subscribe("sap.ushell", "appComponentLoaded", this.onComponentCreated, this);
+            EventBus.getInstance().subscribe("sap.ushell", "getAppLifeCycle", this.onGetMe, this);
 
             RelatedShellElements.init(this.getElementsModel(), aActions);
             this.addEvents();
         };
 
-        this.registerHandleHashChange = function (oShellNavigation) {
-            oShellNavigation.hashChanger.attachEvent("hashChanged", function (oHashChange) {
+        this.registerHandleHashChange = function (oShellNavigationInternal) {
+            oShellNavigationInternal.hashChanger.attachEvent("hashChanged", function (oHashChange) {
                 //FIX for internal incident #1980317281 - In general, hash structure in FLP is splitted into 3 parts:
                 //A - application identification & B - Application parameters & C - Internal application area
                 // Now, when an IFrame changes its hash, it sends PostMessage up to the FLP. The FLP does 2 things: Change its URL
@@ -882,7 +868,7 @@ sap.ui.define([
                 if (hasher.disableBlueBoxHashChangeTrigger === true) {
                     return;
                 }
-                if (oHashChange.mParameters && oShellNavigation.hashChanger.isInnerAppNavigation(oHashChange.mParameters.newHash, oHashChange.mParameters.oldHash)) {
+                if (oHashChange.mParameters && oShellNavigationInternal.hashChanger.isInnerAppNavigation(oHashChange.mParameters.newHash, oHashChange.mParameters.oldHash)) {
                     PostMessageUtils.postMessageToMultipleIframes("sap.ushell.appRuntime", "innerAppRouteChange", {
                         oHash: oHashChange.mParameters
                     });
@@ -1027,9 +1013,6 @@ sap.ui.define([
          *   The application container to activate. Pass <code>null</code> in
          *   case no application container must be activated.
          *
-         * @param {array} aAllApplicationContainers
-         *   All existing application containers
-         *
          * @private
          */
         this.activeContainer = function (oApplicationContainer) {
@@ -1114,7 +1097,7 @@ sap.ui.define([
                     oEventData.appId = sId;
                     oEventData.usageIcon = sIcon;
                     oEventData.usageTitle = sTitle;
-                    Core.getEventBus().publish("sap.ushell", "appClosed", oEventData);
+                    EventBus.getInstance().publish("sap.ushell", "appClosed", oEventData);
                     Log.info("app was closed");
                 }, 0);
 
@@ -1292,7 +1275,7 @@ sap.ui.define([
                 } else {
                     sCurrentPageId = oViewPortContainer.getCurrentCenterPage ? oViewPortContainer.getCurrentCenterPage() : undefined;
                     if (sCurrentPageId) {
-                        oCurrentAppContainer = Core.byId(sCurrentPageId);
+                        oCurrentAppContainer = Element.getElementById(sCurrentPageId);
                     }
                 }
             }
@@ -1446,7 +1429,7 @@ sap.ui.define([
                         //and not old gui v1 statefull
                         if (oInnerControl.getStatefulType && oInnerControl.getStatefulType() !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1 && !bReuseStatefulContainer) {
                             if (bKeptAliveApp === true) {
-                                Core.getEventBus().publish("launchpad", "appOpening", oTarget);
+                                EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
                             }
                             if (that.isAppInCache(oInnerControl.getId())) {
                                 oCurrentApplication = Storage.get(oInnerControl.getId());
@@ -1454,7 +1437,7 @@ sap.ui.define([
                             that.navTo(oInnerControl.getId());
                             if (bKeptAliveApp === true) {
                                 that.initAppMetaParams();
-                                Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
+                                EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
                             }
                         }
 

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

@@ -1,20 +1,20 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.120.8
+ * @version 1.121.0
  */
 sap.ui.define([
+    "sap/ui/core/EventBus",
     "sap/ushell/components/container/ApplicationContainer",
     "sap/ushell/components/applicationIntegration/application/PostMessageAPI",
     "sap/ushell/utils",
     "sap/ui/thirdparty/jquery",
-    "sap/ui/thirdparty/URI",
     "sap/ushell/UI5ComponentType",
     "sap/base/Log",
     "sap/base/util/ObjectPath",
-    "sap/ui/core/Core",
-    "sap/ushell/Config"
-], function (ApplicationContainer, PostMessageAPI, utils, jQuery, URI, UI5ComponentType, Log, ObjectPath, Core, Config) {
+    "sap/ushell/Config",
+    "sap/ushell/Container"
+], function (EventBus, ApplicationContainer, PostMessageAPI, utils, jQuery, UI5ComponentType, Log, ObjectPath, Config, Container) {
     "use strict";
 
     var oActiveApplication,
@@ -49,7 +49,7 @@ sap.ui.define([
 
             if (oMessageData.action === "pro54_setGlobalDirty" &&
                 localStorage.getItem(oContainer.globalDirtyStorageKey) ===
-                sap.ushell.Container.DirtyState.PENDING) {
+                Container.DirtyState.PENDING) {
                 if (!ApplicationContainer.prototype._isTrustedPostMessageSource(oContainer, oMessage)) {
                     // log w/ warning level, message would normally processed by us
                     Log.warning("Received message from untrusted origin: " + oMessage.origin,
@@ -142,7 +142,7 @@ sap.ui.define([
 
             for (var oEntryCommHandlerKey in oShellCommunicationHandlersObj) {
                 if (oShellCommunicationHandlersObj.hasOwnProperty(oEntryCommHandlerKey)) {
-                    if (sService.indexOf(oEntryCommHandlerKey) !== -1) {
+                    if (sService.indexOf(oEntryCommHandlerKey + ".") !== -1) {
                         oMatchHandler = oShellCommunicationHandlersObj[oEntryCommHandlerKey];
                         sServiceHandlerMatchKey = oEntryCommHandlerKey;
                         bIsRegistedService = true;
@@ -287,7 +287,7 @@ sap.ui.define([
              * @private
              */
             function getLocalSystemInSidFormat () {
-                var oSystem = sap.ushell.Container.getLogonSystem();
+                var oSystem = Container.getLogonSystem();
                 var sSystemName = oSystem.getName();
                 var sSystemClient = oSystem.getClient();
 
@@ -341,7 +341,7 @@ sap.ui.define([
             var oPromise,
                 oRenderer;
 
-            oRenderer = sap.ushell.Container.getRenderer();
+            oRenderer = Container.getRendererInternal();
             if (oRenderer) {
                 // should always be the case except initial start; in this case, we return an empty array to avoid delays by an additional async operation
                 Log.debug("Shell controller._createWaitForRendererCreatedPromise: shell renderer already created, return empty array.");
@@ -353,15 +353,15 @@ sap.ui.define([
                 fnOnRendererCreated = function () {
                     Log.info("Shell controller: resolving component waitFor promise after shell renderer created event fired.");
                     resolve();
-                    sap.ushell.Container.detachRendererCreatedEvent(fnOnRendererCreated);
+                    Container.detachRendererCreatedEvent(fnOnRendererCreated);
                 };
-                oRenderer = sap.ushell.Container.getRenderer();
+                oRenderer = Container.getRendererInternal();
                 if (oRenderer) {
                     // unlikely to happen, but be robust
                     Log.debug("Shell controller: resolving component waitFor promise immediately (shell renderer already created");
                     resolve();
                 } else {
-                    sap.ushell.Container.attachRendererCreatedEvent(fnOnRendererCreated);
+                    Container.attachRendererCreatedEvent(fnOnRendererCreated);
                 }
             });
             return [oPromise];
@@ -379,7 +379,7 @@ sap.ui.define([
             var that = this,
                 oDeferred = new jQuery.Deferred();
 
-            sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (Ui5ComponentLoaderService) {
+            Container.getServiceAsync("Ui5ComponentLoader").then(function (Ui5ComponentLoaderService) {
                 Ui5ComponentLoaderService.createComponent(
                     oResolvedHashFragment,
                     oParsedShellHash,
@@ -449,7 +449,7 @@ sap.ui.define([
             }
 
             if (oApp.app) {
-                Core.getEventBus().publish("sap.ushell", "appKeepAliveActivate", oApp.appTarget);
+                EventBus.getInstance().publish("sap.ushell", "appKeepAliveActivate", oApp.appTarget);
 
                 //is Isolated application
                 if (oApp.app.getUrl) {
@@ -495,7 +495,7 @@ sap.ui.define([
             //destroy the application and its resources
             // invoke the life cycle interface "suspend" for the suspend application
             if (oApp.app) {
-                Core.getEventBus().publish("sap.ushell", "appKeepAliveDeactivate", oApp.appTarget);
+                EventBus.getInstance().publish("sap.ushell", "appKeepAliveDeactivate", oApp.appTarget);
 
                 //is Isolated application
                 if (oApp.app.getUrl) {
@@ -570,7 +570,7 @@ sap.ui.define([
                     try {
                         oMessageData = JSON.parse(oMessage.data);
                         if (typeof oMessageData === "object" && oMessageData.type === "request" && oMessageData.service === "sap.ushell.services.MessageBroker") {
-                            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                            Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
                                 var sVal = oMessageBrokerService.getAcceptedOrigins().find(function (sOrigin) {
                                     return sOrigin === oMessage.origin;
                                 });
@@ -589,12 +589,10 @@ sap.ui.define([
             }
         }
 
-        if (Config.last("/core/shell/enableMessageBroker")) {
-            if (sap.ushell && sap.ushell.Container && sap.ushell.Container.getServiceAsync) {
-                sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
-                    addEventListener("message", handleMessageEventForDetaultListener.bind(that));
-                });
-            }
+        if (Config.last("/core/shell/enableMessageBroker") && Container.isInitialized()) {
+            Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                addEventListener("message", handleMessageEventForDetaultListener.bind(that));
+            });
         }
     }
 

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

@@ -1,24 +1,24 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.120.8
+ * @version 1.121.0
  */
 sap.ui.define([
+    "sap/ui/core/EventBus",
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",
     "sap/ushell/components/applicationIntegration/application/PostMessageUtils",
     "sap/ui/thirdparty/jquery",
-    "sap/ui/core/Core",
     "sap/ui/thirdparty/hasher",
-    "sap/base/Log",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ushell/Container"
 ], function (
+    EventBus,
     BlueBoxesCache,
     PostMessageUtils,
     jQuery,
-    Core,
     hasher,
-    Log,
-    utils
+    utils,
+    Container
 ) {
     "use strict";
 
@@ -127,20 +127,20 @@ sap.ui.define([
 
             function callPostMessage () {
                 if (oFLPParams) {
-                    oFLPParams["sap-flp-url"] = sap.ushell.Container.getFLPUrl(true);
+                    oFLPParams["sap-flp-url"] = Container.getFLPUrl(true);
                     oFLPParams["system-alias"] = oInnerControl.getSystemAlias();
                     oPostParams["sap-flp-params"] = oFLPParams;
                 }
 
-                Core.getEventBus().publish("launchpad", "appOpening", oTarget);
+                EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
                 PostMessageUtils.postMessageToIframeApp(
                     oInnerControl, "sap.ushell.services.appLifeCycle", "create", oPostParams, true)
                     .then(function (oResult) {
-                        sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                             if (bNavigationInSameStatefullContainer === true) {
                                 oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
                             }
-                            Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
+                            EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
                             oDeferred.resolve(oResult && oResult.body && oResult.body.result);
                         });
                     });
@@ -162,12 +162,12 @@ sap.ui.define([
                 var oAppStatesInfo = utils.getParamKeys(sUrl);
 
                 if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
-                    sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCANService) {
-                        oCANService.getAppStateData(oAppStatesInfo.aAppStateKeysArray).then(function (aDataArray) {
+                    Container.getServiceAsync("Navigation").then(function (oNavService) {
+                        oNavService.getAppStateData(oAppStatesInfo.aAppStateKeysArray).then(function (aDataArray) {
                             oFLPParams = {};
                             oAppStatesInfo.aAppStateNamesArray.forEach(function (item, index) {
-                                if (aDataArray[index][0]) {
-                                    oFLPParams[item] = aDataArray[index][0];
+                                if (aDataArray[index]) {
+                                    oFLPParams[item] = aDataArray[index];
                                 }
                             });
                             callPostMessage();
@@ -194,13 +194,13 @@ sap.ui.define([
             oInnerControl.setProperty("currentAppId", "", true);
             oAppTarget = oInnerControl.getCurrentAppTargetResolution();
             oInnerControl.setProperty("currentAppTargetResolution", undefined, true);
-            sap.ushell.Container.setAsyncDirtyStateProvider(undefined);
+            Container.setAsyncDirtyStateProvider(undefined);
             oPromise = PostMessageUtils.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "destroy", {
                 sCacheId: sStorageKey
             }, true);
 
             oPromise.then(function () {
-                Core.getEventBus().publish("sap.ushell", "appClosed", oAppTarget);
+                EventBus.getInstance().publish("sap.ushell", "appClosed", oAppTarget);
             });
             return oPromise;
         };
@@ -213,13 +213,13 @@ sap.ui.define([
             oInnerControl.setProperty("currentAppId", "", true);
             oAppTarget = oInnerControl.getCurrentAppTargetResolution();
             oInnerControl.setProperty("currentAppTargetResolution", undefined, true);
-            sap.ushell.Container.setAsyncDirtyStateProvider(undefined);
+            Container.setAsyncDirtyStateProvider(undefined);
             oPromise = PostMessageUtils.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "store", {
                 sCacheId: sStorageKey
             }, true);
 
             oPromise.then(function () {
-                Core.getEventBus().publish("sap.ushell", "appClosed", oAppTarget);
+                EventBus.getInstance().publish("sap.ushell", "appClosed", oAppTarget);
             });
             return oPromise;
         };
@@ -229,17 +229,17 @@ sap.ui.define([
                 oInnerControl.setProperty("currentAppUrl", sUrl, true);
                 oInnerControl.setProperty("currentAppId", sStorageKey, true);
                 oInnerControl.setProperty("currentAppTargetResolution", oTarget, true);
-                Core.getEventBus().publish("launchpad", "appOpening", oTarget);
+                EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
                 PostMessageUtils.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "restore", {
                     sCacheId: sStorageKey,
                     sUrl: oTarget.url,
                     sHash: hasher.getHash()
                 }, true).then(function () {
-                    sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
+                    Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                         if (bNavigationInSameStatefullContainer === true) {
                             oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
                         }
-                        Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
+                        EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
                         fnResolve();
                     });
                 });
@@ -334,17 +334,6 @@ sap.ui.define([
             return false;
         };
 
-        this.changeAppContainerToKeepAlive = function (oAppContainer) {
-            if (!utils.isSAPLegacyApplicationType(oAppContainer.getApplicationType && oAppContainer.getApplicationType(),
-                oAppContainer.getFrameworkId && oAppContainer.getFrameworkId())) {
-                return false;
-            }
-            oAppContainer.setProperty("statefulType", -oAppContainer.getStatefulType(), true);
-            BlueBoxesCache.remove(oAppContainer.getCurrentAppUrl());
-            BlueBoxesCache.add(oAppContainer.getCurrentAppUrl() + "&sap-keep-alive=restricted", oAppContainer);
-            return true;
-        };
-
         this.getStatefulContainerType = function (sUrl, bIgnoreKeepAlive) {
             if (bIgnoreKeepAlive === true) {
                 sUrl = sUrl.replaceAll("sap-keep-alive", "sap-temp");