@sapui5/sap.fe.navigation 1.102.2 → 1.104.1

package/src/sap/fe/navigation/NavigationHandler.js

@@ -55,7 +55,6 @@ sap.ui.define(
 		 *        <b>Note:</b> The check for excluded data requires that the OData metadata has already been loaded completely.<br>
 		 *        If the OData metadata model has not been loaded completely, all properties are removed from the application context.<br>
 		 *        <b>Note:</b> This class requires that the UShell {@link sap.ushell.services.CrossApplicationNavigation} is available and initialized.
-		 *
 		 * @extends sap.ui.base.Object
 		 * @class
 		 * @public
@@ -77,9 +76,9 @@ sap.ui.define(
 		 *         <td>Indicates that the input parameter is invalid</td>
 		 *         </tr>
 		 *         </table>
-		 * @alias sap.fe.navigation.NavigationHandler
+		 * @name sap.fe.navigation.NavigationHandler
 		 */
-		var NavigationHandler = BaseObject.extend("sap.fe.navigation.NavigationHandler" /** @lends sap.fe.navigation.NavigationHandler */, {
+		return BaseObject.extend("sap.fe.navigation.NavigationHandler" /** @lends sap.fe.navigation.NavigationHandler.prototype */, {
 			metadata: {
 				publicMethods: [
 					"navigate",
@@ -127,17 +126,6 @@ sap.ui.define(
 					throw new NavError("NavigationHandler.INVALID_INPUT");
 				}
 
-				try {
-					this.oCrossAppNavService = this._getAppNavigationService();
-					if (!this.oCrossAppNavService) {
-						Log.error("NavigationHandler: CrossApplicationNavigation is not available.");
-						throw new NavError("NavigationHandler.NO.XAPPSERVICE");
-					}
-				} catch (ex) {
-					Log.error("NavigationHandler: UShell service API for CrossApplicationNavigation is not available.");
-					// throw new NavError("NavigationHandler.NO.SHELL");
-				}
-
 				this.IAPP_STATE = "sap-iapp-state";
 				this.sDefaultedParamProp = "sap-ushell-defaultedParameterNames";
 				this.sSAPSystemProp = "sap-system";
@@ -189,6 +177,7 @@ sap.ui.define(
 
 			/**
 			 * Retrieves the shell navigation service.
+			 *
 			 * @returns {object} The Navigation service
 			 * @private
 			 */
@@ -196,6 +185,23 @@ sap.ui.define(
 				return sap.ushell.Container.getService("CrossApplicationNavigation");
 			},
 
+			/**
+			 * Retrieves the shell navigation service.
+			 *
+			 * @returns {object} The Navigation service
+			 * @private
+			 */
+			_getAppNavigationServiceAsync: function () {
+				return sap.ushell.Container.getServiceAsync("CrossApplicationNavigation")
+					.then(function (oCrossAppNavService) {
+						return oCrossAppNavService;
+					})
+					.catch(function () {
+						Log.error("NavigationHandler: CrossApplicationNavigation is not available.");
+						throw new NavError("NavigationHandler.NO.XAPPSERVICE");
+					});
+			},
+
 			/**
 			 * Retrieves the reference to the router object for navigation for this given Controller.
 			 *
@@ -209,6 +215,7 @@ sap.ui.define(
 
 			/**
 			 * This method is to be used only by FE V2 to get access to toExternal promise.
+			 *
 			 * @param {object} fnCallback Callback to be called by 'navigate' method in case of toExternal is used to navigate.
 			 * @private
 			 */
@@ -221,6 +228,28 @@ sap.ui.define(
 			 * <code>sap-ushell-next-navmode</code> is taken into account. If set to <code>explace</code> the inner app state will not be changed.
 			 * <b>Note:</b> The <code>sNavMode</code> argument can be used to overwrite the SAP Fiori launchpad default navigation for opening a URL
 			 * in-place or ex-place.
+			 * <br>
+			 * <b>Node:</b> If the <code>oExternalAppData</code> parameter is not supplied, the external app data will be calculated based on
+			 * the <code>oInnerAppData</code> data.<br>
+			 * SmartFilterBar control <b>Parameters:</b> <table>
+			 * <tr>
+			 * <td align="center">{object}</td>
+			 * <td><b>oError</b></td>
+			 * <td>NavError object (instance of {@link sap.fe.navigation.NavError}) that describes which kind of error occurred</td>
+			 * <tr>
+			 * <td align="center">{string}</td>
+			 * <td><b>oError.errorCode</b></td>
+			 * <td>Code to identify the error</td>
+			 * <tr>
+			 * <td align="center">{string}</td>
+			 * <td><b>oError.type</b></td>
+			 * <td>Severity of the error (info/warning/error)</td>
+			 * <tr>
+			 * <td align="center">{array}</td>
+			 * <td><b>oError.params</b></td>
+			 * <td>An array of objects (typically strings) that describe additional value parameters required for generating the message</td>
+			 * </table>.
+			 *
 			 * @param {string} sSemanticObject Name of the semantic object of the target app
 			 * @param {string} sActionName Name of the action of the target app
 			 * @param {object | string } [vNavigationParameters] Navigation parameters as an object with key/value pairs or as a string representation of
@@ -244,27 +273,7 @@ sap.ui.define(
 			 * @param {string} [sNavMode] Argument is used to overwrite the FLP-configured target for opening a URL. If used, only the
 			 *        <code>explace</code> or <code>inplace</code> values are allowed. Any other value will lead to an exception
 			 *        <code>NavigationHandler.INVALID_NAV_MODE</code>.
-			 * @public <br>
-			 *         <b>Node:</b> If the <code>oExternalAppData</code> parameter is not supplied, the external app data will be calculated based on
-			 *         the <code>oInnerAppData</code> data.<br>
-			 *         SmartFilterBar control <b>Parameters:</b> <table>
-			 *         <tr>
-			 *         <td align="center">{object}</td>
-			 *         <td><b>oError</b></td>
-			 *         <td>NavError object (instance of {@link sap.fe.navigation.NavError}) that describes which kind of error occurred</td>
-			 *         <tr>
-			 *         <td align="center">{string}</td>
-			 *         <td><b>oError.errorCode</b></td>
-			 *         <td>Code to identify the error</td>
-			 *         <tr>
-			 *         <td align="center">{string}</td>
-			 *         <td><b>oError.type</b></td>
-			 *         <td>Severity of the error (info/warning/error)</td>
-			 *         <tr>
-			 *         <td align="center">{array}</td>
-			 *         <td><b>oError.params</b></td>
-			 *         <td>An array of objects (typically strings) that describe additional value parameters required for generating the message</td>
-			 *         </table>
+			 * @public
 			 * @example <code>
 			 * sap.ui.define(["sap/fe/navigation/NavigationHandler", "sap/fe/navigation/SelectionVariant"], function (NavigationHandler, SelectionVariant) {
 			 * 	var oNavigationHandler = new NavigationHandler(oController);
@@ -312,7 +321,7 @@ sap.ui.define(
 					oStartupParameters,
 					bExPlace = false,
 					oTmpData = {},
-					that = this;
+					oNavHandler = this;
 
 				oComponentData = this.oComponent.getComponentData();
 				/*
@@ -376,7 +385,6 @@ sap.ui.define(
 					sSelectionVariant = null;
 				}
 
-				var oNavHandler = this;
 				var oNavArguments = {
 					target: {
 						semanticObject: sSemanticObject,
@@ -385,31 +393,26 @@ sap.ui.define(
 					params: mParameters || {}
 				};
 
-				if (sNavMode) {
-					oNavArguments.params["sap-ushell-navmode"] = bExPlace ? "explace" : "inplace";
-				}
-
-				var oSupportedPromise = oNavHandler.oCrossAppNavService.isNavigationSupported([oNavArguments], oNavHandler.oComponent);
-				oSupportedPromise.done(function (oTargets) {
-					if (oTargets[0].supported) {
-						var oReturn;
-
-						if (!bExPlace) {
-							oReturn = oNavHandler.storeInnerAppStateWithImmediateReturn(oInnerAppData, true);
-							if (oReturn && oReturn.appStateKey) {
-								oNavHandler.replaceHash(oReturn.appStateKey);
-							}
-						}
-
-						if (!oXAppDataObj.selectionVariant) {
-							oXAppDataObj.selectionVariant = sSelectionVariant;
-						}
+				var fnNavigate = function (oCrossAppNavService) {
+					if (!oXAppDataObj.selectionVariant) {
+						oXAppDataObj.selectionVariant = sSelectionVariant;
+					}
 
-						oXAppDataObj = oNavHandler._removeMeasureBasedInformation(oXAppDataObj);
+					var fnNavExplace = function () {
+						var sNewHrefPromise = oCrossAppNavService.hrefForExternalAsync(oNavArguments, oNavHandler.oComponent);
+						sNewHrefPromise
+							.then(function (sNewHref) {
+								openWindow(sNewHref);
+							})
+							.catch(function (oError) {
+								Log.error("Error while retireving hrefForExternal : " + oError);
+							});
+					};
 
-						oReturn = oNavHandler._saveAppStateWithImmediateReturn(oXAppDataObj, fnOnError);
-						if (oReturn) {
-							oNavArguments.appStateKey = oReturn.appStateKey;
+					oXAppDataObj = oNavHandler._removeMeasureBasedInformation(oXAppDataObj);
+					return oNavHandler._fnSaveAppStateAsync(oXAppDataObj, fnOnError).then(function (oSaveAppStateReturn) {
+						if (oSaveAppStateReturn) {
+							oNavArguments.appStateKey = oSaveAppStateReturn.appStateKey;
 
 							// Remark:
 							// The Cross App Service takes care of encoding parameter keys and values. Example:
@@ -419,47 +422,71 @@ sap.ui.define(
 							// toExternal sets sap-xapp-state in the URL if appStateKey is provided in oNavArguments
 							// toExternal has issues on sticky apps FIORITECHP1-14400, temp fix using hrefForExternal
 							if (sNavMode == "explace") {
-								var sNewHrefPromise = oNavHandler.oCrossAppNavService.hrefForExternalAsync(
-									oNavArguments,
-									oNavHandler.oComponent
-								);
-								sNewHrefPromise
-									.then(function (sNewHref) {
-										openWindow(sNewHref);
-									})
-									.catch(function (oError) {
-										Log.error("Error while retireving hrefForExternal : " + oError);
-									});
+								fnNavExplace();
 							} else {
-								var ptoExt = oNavHandler.oCrossAppNavService.toExternal(oNavArguments, oNavHandler.oComponent);
+								var ptoExt = oCrossAppNavService.toExternal(oNavArguments, oNavHandler.oComponent);
 								// TODO: This is just a temporary solution to allow FE V2 to use toExternal promise.
-								if (that._navigateCallback) {
-									that._navigateCallback(ptoExt);
+								if (oNavHandler._navigateCallback) {
+									oNavHandler._navigateCallback(ptoExt);
 								}
 							}
 						} // else : error was already reported
-					} else {
-						// intent is not supported
+					});
+				};
+				var fnStoreAndNavigate = function (oCrossAppNavService) {
+					oNavHandler
+						.storeInnerAppState(oInnerAppData, true)
+						.then(function (sAppStateKey) {
+							if (sAppStateKey) {
+								oNavHandler.replaceHash(sAppStateKey);
+							}
+							return fnNavigate(oCrossAppNavService);
+						})
+						.catch(function (oError) {
+							if (fnOnError) {
+								fnOnError(oError);
+							}
+						});
+				};
+				if (sNavMode) {
+					oNavArguments.params["sap-ushell-navmode"] = bExPlace ? "explace" : "inplace";
+				}
+				oNavHandler
+					._getAppNavigationServiceAsync()
+					.then(function (oCrossAppNavService) {
+						var oSupportedPromise = oCrossAppNavService.isNavigationSupported([oNavArguments], oNavHandler.oComponent);
+						oSupportedPromise.done(function (oTargets) {
+							if (oTargets[0].supported) {
+								if (!bExPlace) {
+									fnStoreAndNavigate(oCrossAppNavService);
+								} else {
+									fnNavigate(oCrossAppNavService);
+								}
+							} else if (fnOnError) {
+								// intent is not supported
+								var oError = new NavError("NavigationHandler.isIntentSupported.notSupported");
+								fnOnError(oError);
+							}
+						});
+
 						if (fnOnError) {
-							var oError = new NavError("NavigationHandler.isIntentSupported.notSupported");
-							fnOnError(oError);
+							oSupportedPromise.fail(function () {
+								// technical error: could not determine if intent is supported
+								var oError = oNavHandler._createTechnicalError("NavigationHandler.isIntentSupported.failed");
+								fnOnError(oError);
+							});
 						}
-					}
-				});
-
-				if (fnOnError) {
-					oSupportedPromise.fail(function () {
-						// technical error: could not determine if intent is supported
-						var oError = oNavHandler._createTechnicalError("NavigationHandler.isIntentSupported.failed");
+					})
+					.catch(function (oError) {
 						fnOnError(oError);
 					});
-				}
 			},
 
 			/**
 			 * Parses the incoming URL and returns a Promise. If this method detects a back navigation, the inner app state is returned in the resolved
 			 * Promise. Otherwise startup parameters will be merged into the app state provided by cross app navigation, and a combined app state will be
 			 * returned. The conflict resolution can be influenced with sParamHandlingMode defined in the constructor.
+			 *
 			 * @returns {object} A Promise object to monitor when all the actions of the function have been executed. If the execution is successful, the
 			 *          extracted app state, the startup parameters, and the type of navigation are returned, see also the example above. The app state is
 			 *          an object that contains the following information:
@@ -545,12 +572,12 @@ sap.ui.define(
 
 				var oMyDeferred = jQuery.Deferred();
 				var oNavHandler = this;
-				var parseUrlParams = function (oStartupParameters, aDefaultedParameters, oMyDeferred, sNavType) {
+				var parseUrlParams = function (oSubStartupParameters, aSubDefaultedParameters, oSubMyDeferred, sNavType) {
 					// standard URL navigation
 					var oSelVars = oNavHandler._splitInboundNavigationParameters(
 						new SelectionVariant(),
-						oStartupParameters,
-						aDefaultedParameters
+						oSubStartupParameters,
+						aSubDefaultedParameters
 					);
 					if (oSelVars.oNavigationSelVar.isEmpty() && oSelVars.oDefaultedSelVar.isEmpty()) {
 						// Startup parameters contain only technical parameters (SAP system) which were filtered out.
@@ -558,9 +585,9 @@ sap.ui.define(
 						// Thus, consider this type of navigation as an initial navigation.
 						if (sNavType === NavType.xAppState) {
 							var oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
-							oMyDeferred.reject(oError, oStartupParameters || {}, NavType.xAppState);
+							oSubMyDeferred.reject(oError, oSubStartupParameters || {}, NavType.xAppState);
 						} else {
-							oMyDeferred.resolve({}, oStartupParameters, NavType.initial);
+							oSubMyDeferred.resolve({}, oSubStartupParameters, NavType.initial);
 						}
 					} else {
 						var oAppStateData = {};
@@ -568,7 +595,7 @@ sap.ui.define(
 						oAppStateData.oSelectionVariant = oSelVars.oNavigationSelVar;
 						oAppStateData.oDefaultedSelectionVariant = oSelVars.oDefaultedSelVar;
 						oAppStateData.bNavSelVarHasDefaultsOnly = oSelVars.bNavSelVarHasDefaultsOnly;
-						oMyDeferred.resolve(oAppStateData, oStartupParameters, sNavType);
+						oSubMyDeferred.resolve(oAppStateData, oSubStartupParameters, sNavType);
 					}
 				};
 				if (sIAppState) {
@@ -578,58 +605,62 @@ sap.ui.define(
 					// no back navigation
 					var bIsXappStateNavigation = oComponentData["sap-xapp-state"] !== undefined;
 					if (bIsXappStateNavigation) {
+						var that = this;
 						// inner app state was not found in the AppHash, but xapp state => try to read the xapp state
-						var oStartupPromise = this.oCrossAppNavService.getStartupAppState(this.oComponent);
-
-						oStartupPromise.done(function (oAppState) {
-							// get app state from sap-xapp-state,
-							// create a copy, not only a reference, because we want to modify the object
-							var oAppStateData = oAppState.getData();
-							if (oAppStateData) {
-								try {
-									oAppStateData = JSON.parse(JSON.stringify(oAppStateData));
-								} catch (x) {
-									var oError = oNavHandler._createTechnicalError("NavigationHandler.AppStateData.parseError");
-									oMyDeferred.reject(oError, oStartupParameters, NavType.xAppState);
-									return oMyDeferred.promise();
-								}
-							}
-
-							if (oAppStateData) {
-								var oSelVar = new SelectionVariant(oAppStateData.selectionVariant);
+						this._getAppNavigationServiceAsync()
+							.then(function (oCrossAppNavService) {
+								var oStartupPromise = oCrossAppNavService.getStartupAppState(that.oComponent);
+								oStartupPromise.done(function (oAppState) {
+									// get app state from sap-xapp-state,
+									// create a copy, not only a reference, because we want to modify the object
+									var oAppStateData = oAppState.getData();
+									var oError;
+									if (oAppStateData) {
+										try {
+											oAppStateData = JSON.parse(JSON.stringify(oAppStateData));
+										} catch (x) {
+											oError = oNavHandler._createTechnicalError("NavigationHandler.AppStateData.parseError");
+											oMyDeferred.reject(oError, oStartupParameters, NavType.xAppState);
+											return oMyDeferred.promise();
+										}
+									}
 
-								var oSelVars = oNavHandler._splitInboundNavigationParameters(
-									oSelVar,
-									oStartupParameters,
-									aDefaultedParameters
-								);
-								oAppStateData.selectionVariant = oSelVars.oNavigationSelVar.toJSONString();
-								oAppStateData.oSelectionVariant = oSelVars.oNavigationSelVar;
-								oAppStateData.oDefaultedSelectionVariant = oSelVars.oDefaultedSelVar;
-								oAppStateData.bNavSelVarHasDefaultsOnly = oSelVars.bNavSelVarHasDefaultsOnly;
-								oMyDeferred.resolve(oAppStateData, oStartupParameters, NavType.xAppState);
-							} else {
-								if (oStartupParameters) {
-									parseUrlParams(oStartupParameters, aDefaultedParameters, oMyDeferred, NavType.xAppState);
-								} else {
-									// sap-xapp-state navigation, but ID has already expired, but URL parameters available
-									oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
-									oMyDeferred.reject(oError, oStartupParameters || {}, NavType.xAppState);
-								}
-							}
-						});
-						oStartupPromise.fail(function () {
-							var oError = oNavHandler._createTechnicalError("NavigationHandler.getStartupState.failed");
-							oMyDeferred.reject(oError, {}, NavType.xAppState);
-						});
-					} else {
+									if (oAppStateData) {
+										var oSelVar = new SelectionVariant(oAppStateData.selectionVariant);
+
+										var oSelVars = oNavHandler._splitInboundNavigationParameters(
+											oSelVar,
+											oStartupParameters,
+											aDefaultedParameters
+										);
+										oAppStateData.selectionVariant = oSelVars.oNavigationSelVar.toJSONString();
+										oAppStateData.oSelectionVariant = oSelVars.oNavigationSelVar;
+										oAppStateData.oDefaultedSelectionVariant = oSelVars.oDefaultedSelVar;
+										oAppStateData.bNavSelVarHasDefaultsOnly = oSelVars.bNavSelVarHasDefaultsOnly;
+										oMyDeferred.resolve(oAppStateData, oStartupParameters, NavType.xAppState);
+									} else if (oStartupParameters) {
+										parseUrlParams(oStartupParameters, aDefaultedParameters, oMyDeferred, NavType.xAppState);
+									} else {
+										// sap-xapp-state navigation, but ID has already expired, but URL parameters available
+										oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
+										oMyDeferred.reject(oError, oStartupParameters || {}, NavType.xAppState);
+									}
+								});
+								oStartupPromise.fail(function () {
+									var oError = oNavHandler._createTechnicalError("NavigationHandler.getStartupState.failed");
+									oMyDeferred.reject(oError, {}, NavType.xAppState);
+								});
+							})
+							.catch(function () {
+								var oError = oNavHandler._createTechnicalError("NavigationHandler._getAppNavigationServiceAsync.failed");
+								oMyDeferred.reject(oError, {}, NavType.xAppState);
+							});
+					} else if (oStartupParameters) {
 						// no sap-xapp-state
-						if (oStartupParameters) {
-							parseUrlParams(oStartupParameters, aDefaultedParameters, oMyDeferred, NavType.URLParams);
-						} else {
-							// initial navigation
-							oMyDeferred.resolve({}, {}, NavType.initial);
-						}
+						parseUrlParams(oStartupParameters, aDefaultedParameters, oMyDeferred, NavType.URLParams);
+					} else {
+						// initial navigation
+						oMyDeferred.resolve({}, {}, NavType.initial);
 					}
 				}
 
@@ -680,6 +711,7 @@ sap.ui.define(
 
 			/**
 			 * Checks if the passed parameter is considered as technical parameter.
+			 *
 			 * @param {string} sParameterName Name of a request parameter, considered as technical parameter.
 			 * @returns {boolean} Indicates if the parameter is considered as technical parameter or not.
 			 * @private
@@ -710,6 +742,7 @@ sap.ui.define(
 
 			/**
 			 * Rmoves if the passed parameter is considered as technical parameter.
+			 *
 			 * @param {object} oSelectionVariant Selection Variant which consists of technical Parameters.
 			 * @returns {object} Selection Variant without technical Parameters.
 			 * @private
@@ -829,13 +862,11 @@ sap.ui.define(
 									throw new NavError("NavigationHandler.INVALID_INPUT");
 							}
 						}
-					} else {
+					} else if (aDefaultedParameters.indexOf(sPropName) > -1) {
 						// parameter only in SelVar
-						if (aDefaultedParameters.indexOf(sPropName) > -1) {
-							oDefaultedSelVar.massAddSelectOption(sPropName, oSelectionVariant.getValue(sPropName));
-						} else {
-							oNavigationSelVar.massAddSelectOption(sPropName, oSelectionVariant.getValue(sPropName));
-						}
+						oDefaultedSelVar.massAddSelectOption(sPropName, oSelectionVariant.getValue(sPropName));
+					} else {
+						oNavigationSelVar.massAddSelectOption(sPropName, oSelectionVariant.getValue(sPropName));
 					}
 				}
 
@@ -881,6 +912,7 @@ sap.ui.define(
 
 			/**
 			 * Changes the URL according to the current sAppStateKey. As an reaction route change event will be triggered.
+			 *
 			 * @param {string} sAppStateKey The new app state key.
 			 * @public
 			 */
@@ -897,6 +929,7 @@ sap.ui.define(
 
 			/**
 			 * Changes the URL according to the current app state and stores the app state for later retrieval.
+			 *
 			 * @param {object} mInnerAppData Object containing the current state of the app
 			 * @param {string} mInnerAppData.selectionVariant Stringified JSON object as returned, for example, from getDataSuiteFormat() of the
 			 *        SmartFilterBar control
@@ -907,6 +940,8 @@ sap.ui.define(
 			 * @param {object} [mInnerAppData.semanticDates] Object containing semanticDates filter information
 			 * @param {boolean} [bImmediateHashReplace=true] If set to false, the inner app hash will not be replaced until storing is successful; do not
 			 *        set to false if you cannot react to the resolution of the Promise, for example, when calling the beforeLinkPressed event
+			 * @param {boolean} [bSkipHashReplace=false] If set to true, the inner app hash will not be replaced in the storeInnerAppState. Also the bImmediateHashReplace
+			 * 		  will be ignored.
 			 * @returns {object} A Promise object to monitor when all the actions of the function have been executed; if the execution is successful, the
 			 *          app state key is returned; if an error occurs, an object of type {@link sap.fe.navigation.NavError} is
 			 *          returned
@@ -933,7 +968,7 @@ sap.ui.define(
 			 * });
 			 * </code>
 			 */
-			storeInnerAppState: function (mInnerAppData, bImmediateHashReplace) {
+			storeInnerAppState: function (mInnerAppData, bImmediateHashReplace, bSkipHashReplace) {
 				if (typeof bImmediateHashReplace !== "boolean") {
 					bImmediateHashReplace = true; // default
 				}
@@ -976,7 +1011,7 @@ sap.ui.define(
 
 				var fnOnAfterSave = function (sAppStateKey) {
 					// replace inner app hash with new appStateKey in url
-					if (!bImmediateHashReplace) {
+					if (!bSkipHashReplace && !bImmediateHashReplace) {
 						fnReplaceHash(sAppStateKey);
 					}
 
@@ -990,26 +1025,31 @@ sap.ui.define(
 					oMyDeferred.reject(oError);
 				};
 
-				var sAppStateKey = this._saveAppState(mInnerAppData, fnOnAfterSave, fnOnError);
-				/*
-				 * Note that _sapAppState may return 'undefined' in case that the parsing has failed. In this case, we should not trigger the replacement
-				 * of the App Hash with the generated key, as the container was not written before. Note as well that the error handling has already
-				 * happened before by making the oMyDeferred promise fail (see fnOnError above).
-				 */
-				if (sAppStateKey !== undefined) {
-					// replace inner app hash with new appStateKey in url
-					// note: we do not wait for the save to be completed: this asynchronously behaviour is necessary if
-					// this method is called e.g. in a onLinkPressed event with no possibility to wait for the promise resolution
-					if (bImmediateHashReplace) {
-						fnReplaceHash(sAppStateKey);
-					}
-				}
+				this._saveAppStateAsync(mInnerAppData, fnOnAfterSave, fnOnError)
+					.then(function (sAppStateKey) {
+						/* Note that _sapAppState may return 'undefined' in case that the parsing has failed. In this case, we should not trigger the replacement
+						 * of the App Hash with the generated key, as the container was not written before. Note as well that the error handling has already
+						 * happened before by making the oMyDeferred promise fail (see fnOnError above).
+						 */
+						if (sAppStateKey !== undefined) {
+							// replace inner app hash with new appStateKey in url
+							// note: we do not wait for the save to be completed: this asynchronously behaviour is necessary if
+							// this method is called e.g. in a onLinkPressed event with no possibility to wait for the promise resolution
+							if (!bSkipHashReplace && bImmediateHashReplace) {
+								fnReplaceHash(sAppStateKey);
+							}
+						}
+					})
+					.catch(function () {
+						Log.error("NavigationHandler._saveAppStateAsync failed");
+					});
 
 				return oMyDeferred.promise();
 			},
 
 			/**
 			 * Changes the URL according to the current app state and stores the app state for later retrieval.
+			 *
 			 * @param {object} mInnerAppData Object containing the current state of the app
 			 * @param {string} mInnerAppData.selectionVariant Stringified JSON object as returned, for example, from getDataSuiteFormat() of the
 			 *        SmartFilterBar control
@@ -1051,13 +1091,19 @@ sap.ui.define(
 			 * });
 			 * </code>
 			 * @public
+			 * @deprecated as of version 1.104. Use the {@link sap.fe.navigation.NavigationHandler.storeInnerAppState} instead.
 			 */
 			storeInnerAppStateWithImmediateReturn: function (mInnerAppData, bImmediateHashReplace) {
+				Log.error(
+					"Deprecated API call of 'sap.fe.navigation.NavigationHandler.storeInnerAppStateWithImmediateReturn'. Please use 'storeInnerAppState' instead",
+					null,
+					"sap.fe.navigation.NavigationHandler"
+				);
 				if (typeof bImmediateHashReplace !== "boolean") {
 					bImmediateHashReplace = false; // default
 				}
 
-				var that = this;
+				var oNavHandler = this;
 				var oAppStatePromise = jQuery.Deferred();
 
 				// in case mInnerAppState is empty, do not overwrite the last saved state
@@ -1087,12 +1133,12 @@ sap.ui.define(
 				var fnOnAfterSave = function (sAppStateKey) {
 					// replace inner app hash with new appStateKey in url
 					if (!bImmediateHashReplace) {
-						that.replaceHash(sAppStateKey);
+						oNavHandler.replaceHash(sAppStateKey);
 					}
 
 					// remember last saved state
-					that._oLastSavedInnerAppData.oAppData = mInnerAppData;
-					that._oLastSavedInnerAppData.sAppStateKey = sAppStateKey;
+					oNavHandler._oLastSavedInnerAppData.oAppData = mInnerAppData;
+					oNavHandler._oLastSavedInnerAppData.sAppStateKey = sAppStateKey;
 					oAppStatePromise.resolve(sAppStateKey);
 				};
 
@@ -1133,6 +1179,9 @@ sap.ui.define(
 			 * <li>The method <code>oTableEventParameters.open()</code> is called. Note that this does not really open the popover, but the SmartLink
 			 * control proceeds with firing the event <code>navigationTargetsObtained</code>.</li>
 			 * </ul>.
+			 * <br>
+			 * <b>Node:</b> If the <code>oExternalAppData</code> parameter is not supplied, the external app data will be calculated based on
+			 * the <code>mInnerAppData</code> data.<br>.
 			 *
 			 * @param {object} oTableEventParameters The parameters made available by the SmartTable control when the SmartLink control has been clicked,
 			 *        an instance of a PopOver object
@@ -1155,9 +1204,7 @@ sap.ui.define(
 			 * @returns {object} A Promise object to monitor when all actions of the function have been executed; if the execution is successful, the
 			 *          modified oTableEventParameters is returned; if an error occurs, an error object of type
 			 *          {@link sap.fe.navigation.NavError} is returned
-			 * @public <br>
-			 *         <b>Node:</b> If the <code>oExternalAppData</code> parameter is not supplied, the external app data will be calculated based on
-			 *         the <code>mInnerAppData</code> data.<br>
+			 * @public
 			 * @example <code>
 			 * sap.ui.define(["sap/fe/navigation/NavigationHandler", "sap/fe/navigation/SelectionVariant"], function (NavigationHandler, SelectionVariant) {
 			 * 	//event handler for the smart link event "beforePopoverOpens"
@@ -1205,9 +1252,9 @@ sap.ui.define(
 					oXAppDataObj = oExternalAppData;
 				}
 
-				var fnStoreXappAndCallOpen = function (mSemanticAttributes, sSelectionVariant) {
+				var fnStoreXappAndCallOpen = function (mSubSemanticAttributes, sSubSelectionVariant) {
 					// mix the semantic attributes (e.g. from the row line) with the selection variant (e.g. from the filter bar)
-					sSelectionVariant = oXAppDataObj.selectionVariant || sSelectionVariant || "{}";
+					sSubSelectionVariant = oXAppDataObj.selectionVariant || sSubSelectionVariant || "{}";
 
 					var iSuppressionBehavior = SuppressionBehavior.raiseErrorOnNull | SuppressionBehavior.raiseErrorOnUndefined;
 					/*
@@ -1218,11 +1265,11 @@ sap.ui.define(
 					 */
 
 					var oMixedSelVar = oNavHandler.mixAttributesAndSelectionVariant(
-						mSemanticAttributes,
-						sSelectionVariant,
+						mSubSemanticAttributes,
+						sSubSelectionVariant,
 						iSuppressionBehavior
 					);
-					sSelectionVariant = oMixedSelVar.toJSONString();
+					sSubSelectionVariant = oMixedSelVar.toJSONString();
 
 					// enrich the semantic attributes with single selections from the selection variant
 					var oTmpData = {};
@@ -1232,17 +1279,17 @@ sap.ui.define(
 
 					oTmpData = oNavHandler._checkIsPotentiallySensitive(oTmpData);
 
-					mSemanticAttributes = oTmpData.selectionVariant
+					mSubSemanticAttributes = oTmpData.selectionVariant
 						? oNavHandler._getURLParametersFromSelectionVariant(new SelectionVariant(oTmpData.selectionVariant))
 						: {};
 
 					var fnOnContainerSave = function (sAppStateKey) {
 						if (oTableEventParameters === undefined) {
 							// If oTableEventParameters is undefined, return both semanticAttributes and appStatekey
-							oMyDeferred.resolve(mSemanticAttributes, sAppStateKey);
+							oMyDeferred.resolve(mSubSemanticAttributes, sAppStateKey);
 						} else {
 							// set the stored data in popover and call open()
-							oTableEventParameters.setSemanticAttributes(mSemanticAttributes);
+							oTableEventParameters.setSemanticAttributes(mSubSemanticAttributes);
 							oTableEventParameters.setAppStateKey(sAppStateKey);
 							oTableEventParameters.open(); // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Note that "open" does not open the popover, but proceeds
 							// with firing the onNavTargetsObtained event.
@@ -1254,11 +1301,11 @@ sap.ui.define(
 						oMyDeferred.reject(oError);
 					};
 
-					oXAppDataObj.selectionVariant = sSelectionVariant;
+					oXAppDataObj.selectionVariant = sSubSelectionVariant;
 
 					oXAppDataObj = oNavHandler._removeMeasureBasedInformation(oXAppDataObj);
 
-					oNavHandler._saveAppState(oXAppDataObj, fnOnContainerSave, fnOnError);
+					oNavHandler._saveAppStateAsync(oXAppDataObj, fnOnContainerSave, fnOnError);
 				};
 
 				if (mInnerAppData) {
@@ -1282,6 +1329,7 @@ sap.ui.define(
 
 			/**
 			 * Processes selectionVariant string and returns a Promise object (semanticAttributes and AppStateKey).
+			 *
 			 * @param {string} sSelectionVariant Stringified JSON object
 			 * @returns {object} A Promise object to monitor when all actions of the function have been executed; if the execution is successful, the
 			 *          semanticAttributes as well as the appStateKey are returned; if an error occurs, an error object of type
@@ -1378,9 +1426,10 @@ sap.ui.define(
 			 * overriding existing properties in the selection variant. The new selection variant does not contain any parameters. All parameters are
 			 * merged into select options. The output of this function, converted to a JSON string, can be used for the
 			 * {@link #.navigate NavigationHandler.navigate} method.
+			 *
 			 * @param {object|Array} vSemanticAttributes Object/(Array of Objects) containing key/value pairs
 			 * @param {string} sSelectionVariant The selection variant in string format as provided by the SmartFilterBar control
-			 * @param {int} [iSuppressionBehavior=sap.fe.navigation.SuppressionBehavior.standard] Indicates whether semantic
+			 * @param {number} [iSuppressionBehavior=sap.fe.navigation.SuppressionBehavior.standard] Indicates whether semantic
 			 *        attributes with special values (see {@link sap.fe.navigation.SuppressionBehavior suppression behavior}) must be
 			 *        suppressed before they are combined with the selection variant; several
 			 *        {@link sap.fe.navigation.SuppressionBehavior suppression behaviors} can be combined with the bitwise OR operator
@@ -1407,7 +1456,7 @@ sap.ui.define(
 			mixAttributesAndSelectionVariant: function (vSemanticAttributes, sSelectionVariant, iSuppressionBehavior) {
 				var oSelectionVariant = new SelectionVariant(sSelectionVariant);
 				var oNewSelVariant = new SelectionVariant();
-				var that = this;
+				var oNavHandler = this;
 
 				if (oSelectionVariant.getFilterContextUrl()) {
 					oNewSelVariant.setFilterContextUrl(oSelectionVariant.getFilterContextUrl());
@@ -1417,7 +1466,7 @@ sap.ui.define(
 				}
 				if (Array.isArray(vSemanticAttributes)) {
 					vSemanticAttributes.forEach(function (mSemanticAttributes) {
-						that._mixAttributesToSelVariant(mSemanticAttributes, oNewSelVariant, iSuppressionBehavior);
+						oNavHandler._mixAttributesToSelVariant(mSemanticAttributes, oNewSelVariant, iSuppressionBehavior);
 					});
 				} else {
 					this._mixAttributesToSelVariant(vSemanticAttributes, oNewSelVariant, iSuppressionBehavior);
@@ -1425,7 +1474,8 @@ sap.ui.define(
 
 				// add parameters that are not part of the oNewSelVariant yet
 				var aParameters = oSelectionVariant.getParameterNames();
-				for (var i = 0; i < aParameters.length; i++) {
+				var i;
+				for (i = 0; i < aParameters.length; i++) {
 					if (!oNewSelVariant.getSelectOption(aParameters[i])) {
 						oNewSelVariant.addSelectOption(aParameters[i], "I", "EQ", oSelectionVariant.getParameter(aParameters[i]));
 					}
@@ -1472,32 +1522,56 @@ sap.ui.define(
 
 				return vConvertedSelectionVariant;
 			},
+			_fnHandleAppStatePromise: function (oReturn, fnOnAfterSave, fnOnError) {
+				oReturn.promise.done(function () {
+					if (fnOnAfterSave) {
+						fnOnAfterSave(oReturn.appStateKey);
+					}
+				});
+
+				if (fnOnError) {
+					var oNavHandler = this;
+					oReturn.promise.fail(function () {
+						var oError = oNavHandler._createTechnicalError("NavigationHandler.AppStateSave.failed");
+						fnOnError(oError);
+					});
+				}
+			},
+			_saveAppStateAsync: function (oAppData, fnOnAfterSave, fnOnError) {
+				var oNavHandler = this;
+				return this._fnSaveAppStateAsync(oAppData, fnOnError).then(function (oReturn) {
+					if (oReturn) {
+						oNavHandler._fnHandleAppStatePromise(oReturn, fnOnAfterSave, fnOnError);
+						return oReturn.appStateKey;
+					}
 
+					return undefined;
+				});
+			},
 			_saveAppState: function (oAppData, fnOnAfterSave, fnOnError) {
 				var oReturn = this._saveAppStateWithImmediateReturn(oAppData, fnOnError);
 				if (oReturn) {
-					oReturn.promise.done(function () {
-						if (fnOnAfterSave) {
-							fnOnAfterSave(oReturn.appStateKey);
-						}
-					});
-
-					if (fnOnError) {
-						var oNavHandler = this;
-						oReturn.promise.fail(function () {
-							var oError = oNavHandler._createTechnicalError("NavigationHandler.AppStateSave.failed");
-							fnOnError(oError);
-						});
-					}
+					this._fnHandleAppStatePromise(oReturn, fnOnAfterSave, fnOnError);
 					return oReturn.appStateKey;
 				}
 
 				return undefined;
 			},
-
-			_saveAppStateWithImmediateReturn: function (oAppData, fnOnError) {
-				var oAppState = this.oCrossAppNavService.createEmptyAppState(this.oComponent);
+			_fnSaveAppStateWithImmediateReturn: function (oAppData, oAppState, fnOnError) {
 				var sAppStateKey = oAppState.getKey();
+				var oAppDataForSave = this._fetchAppDataForSave(oAppData, fnOnError);
+				if (!oAppDataForSave) {
+					return undefined;
+				}
+				oAppState.setData(oAppDataForSave);
+				var oSavePromise = oAppState.save();
+
+				return {
+					appStateKey: sAppStateKey,
+					promise: oSavePromise.promise()
+				};
+			},
+			_fetchAppDataForSave: function (oAppData, fnOnError) {
 				var oAppDataForSave = {};
 
 				if (oAppData.hasOwnProperty("selectionVariant")) {
@@ -1552,92 +1626,110 @@ sap.ui.define(
 					oAppDataForSave = merge(oAppDataClone, oAppDataForSave);
 				}
 				oAppDataForSave = this._checkIsPotentiallySensitive(oAppDataForSave);
-				oAppState.setData(oAppDataForSave);
-				var oSavePromise = oAppState.save();
-
-				return {
-					appStateKey: sAppStateKey,
-					promise: oSavePromise.promise()
-				};
+				return oAppDataForSave;
+			},
+			_fnSaveAppStateAsync: function (oAppData, fnOnError) {
+				var oNavHandler = this;
+				return this._getAppNavigationServiceAsync().then(function (oCrossAppNavService) {
+					return oCrossAppNavService
+						.createEmptyAppStateAsync(oNavHandler.oComponent)
+						.then(function (oAppState) {
+							return oNavHandler._fnSaveAppStateWithImmediateReturn(oAppData, oAppState, fnOnError);
+						})
+						.catch(function (oError) {
+							if (fnOnError) {
+								fnOnError(oError);
+							}
+						});
+				});
+			},
+			_saveAppStateWithImmediateReturn: function (oAppData, fnOnError) {
+				var oAppState = this._getAppNavigationService().createEmptyAppState(this.oComponent);
+				return this._fnSaveAppStateWithImmediateReturn(oAppData, oAppState, fnOnError);
 			},
 
 			_loadAppState: function (sAppStateKey, oDeferred) {
-				var oAppStatePromise = this.oCrossAppNavService.getAppState(this.oComponent, sAppStateKey);
 				var oNavHandler = this;
-
-				oAppStatePromise.done(function (oAppState) {
-					var oAppData = {};
-					var oAppDataLoaded = oAppState.getData();
-
-					if (typeof oAppDataLoaded === "undefined") {
-						var oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
-						oDeferred.reject(oError, {}, NavType.iAppState);
-					} else {
-						if (oNavHandler._sMode === Mode.ODataV2) {
-							oAppData = {
-								selectionVariant: "{}",
-								oSelectionVariant: new SelectionVariant(),
-								oDefaultedSelectionVariant: new SelectionVariant(),
-								bNavSelVarHasDefaultsOnly: false,
-								tableVariantId: "",
-								customData: {},
-								appStateKey: sAppStateKey,
-								presentationVariant: {},
-								valueTexts: {},
-								semanticDates: {}
-							};
-							if (oAppDataLoaded.selectionVariant) {
-								/*
-								 * In case that we get an object from the stored AppData (=persistency), we need to stringify the JSON object.
-								 */
-								oAppData.selectionVariant = oNavHandler._ensureSelectionVariantFormatString(
-									oAppDataLoaded.selectionVariant
-								);
-								oAppData.oSelectionVariant = new SelectionVariant(oAppData.selectionVariant);
-							}
-							if (oAppDataLoaded.tableVariantId) {
-								oAppData.tableVariantId = oAppDataLoaded.tableVariantId;
-							}
-							if (oAppDataLoaded.customData) {
-								oAppData.customData = oAppDataLoaded.customData;
-							}
-							if (oAppDataLoaded.presentationVariant) {
-								oAppData.presentationVariant = oAppDataLoaded.presentationVariant;
-							}
-							if (oAppDataLoaded.valueTexts) {
-								oAppData.valueTexts = oAppDataLoaded.valueTexts;
-							}
-							if (oAppDataLoaded.semanticDates) {
-								oAppData.semanticDates = oAppDataLoaded.semanticDates;
-							}
-						} else {
-							oAppData = merge(oAppData, oAppDataLoaded);
-							if (oAppDataLoaded.selectionVariant) {
-								/*
-								 * In case that we get an object from the stored AppData (=persistency), we need to stringify the JSON object.
-								 */
-								oAppData.selectionVariant = oNavHandler._ensureSelectionVariantFormatString(
-									oAppDataLoaded.selectionVariant
-								);
-								oAppData.oSelectionVariant = new SelectionVariant(oAppData.selectionVariant);
+				this._getAppNavigationServiceAsync()
+					.then(function (oCrossAppNavService) {
+						var oAppStatePromise = oCrossAppNavService.getAppState(oNavHandler.oComponent, sAppStateKey);
+						oAppStatePromise.done(function (oAppState) {
+							var oAppData = {};
+							var oAppDataLoaded = oAppState.getData();
+
+							if (typeof oAppDataLoaded === "undefined") {
+								var oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
+								oDeferred.reject(oError, {}, NavType.iAppState);
+							} else if (oNavHandler._sMode === Mode.ODataV2) {
+								oAppData = {
+									selectionVariant: "{}",
+									oSelectionVariant: new SelectionVariant(),
+									oDefaultedSelectionVariant: new SelectionVariant(),
+									bNavSelVarHasDefaultsOnly: false,
+									tableVariantId: "",
+									customData: {},
+									appStateKey: sAppStateKey,
+									presentationVariant: {},
+									valueTexts: {},
+									semanticDates: {}
+								};
+								if (oAppDataLoaded.selectionVariant) {
+									/*
+									 * In case that we get an object from the stored AppData (=persistency), we need to stringify the JSON object.
+									 */
+									oAppData.selectionVariant = oNavHandler._ensureSelectionVariantFormatString(
+										oAppDataLoaded.selectionVariant
+									);
+									oAppData.oSelectionVariant = new SelectionVariant(oAppData.selectionVariant);
+								}
+								if (oAppDataLoaded.tableVariantId) {
+									oAppData.tableVariantId = oAppDataLoaded.tableVariantId;
+								}
+								if (oAppDataLoaded.customData) {
+									oAppData.customData = oAppDataLoaded.customData;
+								}
+								if (oAppDataLoaded.presentationVariant) {
+									oAppData.presentationVariant = oAppDataLoaded.presentationVariant;
+								}
+								if (oAppDataLoaded.valueTexts) {
+									oAppData.valueTexts = oAppDataLoaded.valueTexts;
+								}
+								if (oAppDataLoaded.semanticDates) {
+									oAppData.semanticDates = oAppDataLoaded.semanticDates;
+								}
+							} else {
+								oAppData = merge(oAppData, oAppDataLoaded);
+								if (oAppDataLoaded.selectionVariant) {
+									/*
+									 * In case that we get an object from the stored AppData (=persistency), we need to stringify the JSON object.
+									 */
+									oAppData.selectionVariant = oNavHandler._ensureSelectionVariantFormatString(
+										oAppDataLoaded.selectionVariant
+									);
+									oAppData.oSelectionVariant = new SelectionVariant(oAppData.selectionVariant);
+								}
 							}
-						}
-					}
 
-					// resolve is called on passed Deferred object to trigger a call of the done method, if implemented
-					// the done method will receive the loaded appState and the navigation type as parameters
-					oDeferred.resolve(oAppData, {}, NavType.iAppState);
-				});
-				oAppStatePromise.fail(function () {
-					var oError = oNavHandler._createTechnicalError("NavigationHandler.getAppState.failed");
-					oDeferred.reject(oError, {}, NavType.iAppState);
-				});
+							// resolve is called on passed Deferred object to trigger a call of the done method, if implemented
+							// the done method will receive the loaded appState and the navigation type as parameters
+							oDeferred.resolve(oAppData, {}, NavType.iAppState);
+						});
+						oAppStatePromise.fail(function () {
+							var oError = oNavHandler._createTechnicalError("NavigationHandler.getAppState.failed");
+							oDeferred.reject(oError, {}, NavType.iAppState);
+						});
+					})
+					.catch(function () {
+						var oError = oNavHandler._createTechnicalError("NavigationHandler._getAppNavigationServiceAsync.failed");
+						oDeferred.reject(oError, {}, NavType.iAppState);
+					});
 			},
 
 			/**
 			 * Retrieves the parameter value of the sap-iapp-state (the internal apps) from the AppHash string. It automatically takes care about
 			 * compatibility between the old and the new approach of the sap-iapp-state. Precedence is that the new approach is favoured against the old
 			 * approach.
+			 *
 			 * @param {string} sAppHash The AppHash, which may contain a sap-iapp-state parameter (both old and/or new approach)
 			 * @returns {string} The value of sap-iapp-state (i.e. the name of the container to retrieve the parameters), or <code>undefined</code> in
 			 *         case that no sap-iapp-state was found in <code>sAppHash</code>.
@@ -1677,6 +1769,7 @@ sap.ui.define(
 			 * Replaces (or inserts) a parameter value (an AppStateKey) for the sap-iapp-state into an existing AppHash string. Other routes/parameters
 			 * are ignored and returned without modification ("environmental agnostic" property). Only the new approach (sap-iapp-state as query parameter
 			 * in the AppHash) is being issued.
+			 *
 			 * @param {string} sAppHash The AppHash into which the sap-iapp-state parameter shall be made available
 			 * @param {string} sAppStateKey The key value of the AppState which shall be stored as parameter value of the sap-iapp-state property.
 			 * @returns {string} The modified sAppHash string, such that the sap-iapp-state has been set based on the new (query option-based)
@@ -1695,16 +1788,16 @@ sap.ui.define(
 					return "?" + sNewIAppState;
 				}
 
-				var fnAppendToQueryParameter = function (sAppHash) {
+				var fnAppendToQueryParameter = function (sSubAppHash) {
 					// there is an AppHash available, but it does not contain a sap-iapp-state parameter yet - we need to append one
 
 					// new approach: we need to check, if a set of query parameters is already available
-					if (sAppHash.indexOf("?") !== -1) {
+					if (sSubAppHash.indexOf("?") !== -1) {
 						// there are already query parameters available - append it as another parameter
-						return sAppHash + "&" + sNewIAppState;
+						return sSubAppHash + "&" + sNewIAppState;
 					}
 					// there are no a query parameters available yet; create a set with a single parameter
-					return sAppHash + "?" + sNewIAppState;
+					return sSubAppHash + "?" + sNewIAppState;
 				};
 
 				if (!this._getInnerAppStateKey(sAppHash)) {
@@ -1721,9 +1814,9 @@ sap.ui.define(
 
 				// we need to remove the old AppHash entirely and replace it with a new one.
 
-				var fnReplaceOldApproach = function (rOldApproach, sAppHash) {
-					sAppHash = sAppHash.replace(rOldApproach, "");
-					return fnAppendToQueryParameter(sAppHash);
+				var fnReplaceOldApproach = function (rOldApproach, sSubAppHash) {
+					sSubAppHash = sSubAppHash.replace(rOldApproach, "");
+					return fnAppendToQueryParameter(sSubAppHash);
 				};
 
 				if (this._rIAppStateOld.test(sAppHash)) {
@@ -1741,9 +1834,10 @@ sap.ui.define(
 			_getURLParametersFromSelectionVariant: function (vSelectionVariant) {
 				var mURLParameters = {};
 				var i = 0;
+				var oSelectionVariant;
 
 				if (typeof vSelectionVariant === "string") {
-					var oSelectionVariant = new SelectionVariant(vSelectionVariant);
+					oSelectionVariant = new SelectionVariant(vSelectionVariant);
 				} else if (typeof vSelectionVariant === "object") {
 					oSelectionVariant = vSelectionVariant;
 				} else {
@@ -1776,6 +1870,7 @@ sap.ui.define(
 			/**
 			 * Sets the model that is used for verification of sensitive information. If the model is not set, the unnamed component model is used for the
 			 * verification of sensitive information.
+			 *
 			 * @public
 			 * @param {sap.ui.model.odata.v2.ODataModel} oModel For checking sensitive information
 			 */
@@ -2077,6 +2172,7 @@ sap.ui.define(
 			/**
 			 * The method verifies if any of the passed parameters/filters are marked as a measure. If this is the case, they are removed from the xapp
 			 * app data. <b>Note:</b> To use this method, the metadata must be loaded first.
+			 *
 			 * @param {object} oData With potential sensitive information (for OData, external representation using
 			 * <code>oSelectionVariant.toJSONObject()</code> must be used), with the <code>FilterContextUrl</code> or
 			 * <code>ParameterContextUrl</code> property.
@@ -2207,9 +2303,9 @@ sap.ui.define(
 			 * @param {object} oData Selection variant
 			 * @param {boolean} bMeasure Should measures be removed
 			 * @returns {object} The selection variant after sensitive data has been removed
-			 **/
+			 */
 			_removeSensitiveDataForODataV4: function (oData, bMeasure) {
-				var that = this,
+				var oNavHandler = this,
 					aFilterContextPart,
 					oSV = new SelectionVariant(oData.selectionVariant),
 					oModel = this._getModel();
@@ -2244,7 +2340,7 @@ sap.ui.define(
 							if (aPropertyAnnotations) {
 								if (
 									(bMeasure && aPropertyAnnotations["@com.sap.vocabularies.Analytics.v1.Measure"]) ||
-									that._checkPropertyAnnotationsForSensitiveData(aPropertyAnnotations)
+									oNavHandler._checkPropertyAnnotationsForSensitiveData(aPropertyAnnotations)
 								) {
 									return true;
 								} else if (aPropertyAnnotations["@com.sap.vocabularies.Common.v1.FieldControl"]) {
@@ -2276,7 +2372,5 @@ sap.ui.define(
 				);
 			}
 		});
-
-		return NavigationHandler;
 	}
 );