rebase

CHANGELOG.md

@@ -4,12 +4,58 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [6.0.3](https://github.com/rdkcentral/rdke-refui/compare/6.0.2...6.0.3)
+
+- Updated the version for refui boltpackage [`#175`](https://github.com/rdkcentral/rdke-refui/pull/175)
+- Merge tag '6.0.2' into develop [`7d4582c`](https://github.com/rdkcentral/rdke-refui/commit/7d4582c752991e63442df51fecbaf152e355e4c5)
+
+#### [6.0.2](https://github.com/rdkcentral/rdke-refui/compare/6.0.1...6.0.2)
+
+> 7 April 2026
+
+- RDKEAPPRT-683: RemoteControl plugin API align with MW APIv3.4.2 [`#171`](https://github.com/rdkcentral/rdke-refui/pull/171)
+- RDKEAPPRT-683: Fix the RCU pairing trigger timers [`47df636`](https://github.com/rdkcentral/rdke-refui/commit/47df6367819c67c9bcab0a5ed99fa3007e976d99)
+- RDKEAPPRT-683: fix the RCU re scanning logic leak. [`2610642`](https://github.com/rdkcentral/rdke-refui/commit/2610642a37e0d975cfb59ac9d5d4aa498ae4a115)
+- /RDKEAPPRT-683: stop the scan triggers after RCU pairing [`34ee6be`](https://github.com/rdkcentral/rdke-refui/commit/34ee6bea00a1aba71dcbc2e969ef5a6d22f2e94c)
+
+#### [6.0.1](https://github.com/rdkcentral/rdke-refui/compare/6.0.0...6.0.1)
+
+> 31 March 2026
+
+- Feature/rdkeapprt 680 :Update to new RDK logos [`#168`](https://github.com/rdkcentral/rdke-refui/pull/168)
+- RDKEAPPRT-682 Changelog and package config version  updates for 6.0.1 [`32bbba6`](https://github.com/rdkcentral/rdke-refui/commit/32bbba6f7cde97607cac613f80240a174073c6bf)
+- RDKEAPPRT-680 :Update new logo [`83513d8`](https://github.com/rdkcentral/rdke-refui/commit/83513d8d0566d994927583ed7891c655660af97f)
+- RDKEAPPRT-680:Update the new logo files [`c2b261f`](https://github.com/rdkcentral/rdke-refui/commit/c2b261ff1ea9e4e72a8750f77652d6f4261775ce)
+
+### [6.0.0](https://github.com/rdkcentral/rdke-refui/compare/5.0.24...6.0.0)
+
+> 31 March 2026
+
+- To refresh the App store and main view when the authentication done [`#166`](https://github.com/rdkcentral/rdke-refui/pull/166)
+- RDKEAPPRT-661 Add support for new authorization in App Catalog [`#165`](https://github.com/rdkcentral/rdke-refui/pull/165)
+- RDKEAPPRT-621,606,648,644 fix for Language screen and powerstate issue [`#164`](https://github.com/rdkcentral/rdke-refui/pull/164)
+- RDKEAPPRT-646 Create the Username, Password page and add it inside the settings route [`#163`](https://github.com/rdkcentral/rdke-refui/pull/163)
+- RDKEAPPRT-645 Add default error overlay when user tries to enter VOD content [`#162`](https://github.com/rdkcentral/rdke-refui/pull/162)
+- RDKEAPPRT-612 :Add dac store details via RFC [`#160`](https://github.com/rdkcentral/rdke-refui/pull/160)
+- RDKEAPPRT-626,627,628,605,608,622 Fix error and uninstall overlay screen with bug fixes [`#161`](https://github.com/rdkcentral/rdke-refui/pull/161)
+- RDKEAPPRT-601,602 App side loading and App side loading and closeApp() function [`#158`](https://github.com/rdkcentral/rdke-refui/pull/158)
+- To merge the changes from Feature/app managers to develop [`#157`](https://github.com/rdkcentral/rdke-refui/pull/157)
+- RDKEAPPRT-576 Improve focus management [`#155`](https://github.com/rdkcentral/rdke-refui/pull/155)
+- RDKEAPPRT-341 App managers intake: abstractions, API migration and YouTube Launch Support [`#146`](https://github.com/rdkcentral/rdke-refui/pull/146)
+- RDKEAPPRT-571 Create UI prototype with My Apps, Recommended Apps, VOD Rows and Appinfo (#156) [`eff1a86`](https://github.com/rdkcentral/rdke-refui/commit/eff1a864e55c28ed1c542e26f818d20f082a6dca)
+- RDKEAPPRT-538 Add basic integration with the RDK Reference DAC 2.0 App Store (#152) [`82eda3d`](https://github.com/rdkcentral/rdke-refui/commit/82eda3d7b34b80be63bdf3d0cb39d6c3f7f1f681)
+- Changes for the error and uninstall overlay screen then some bug fixes also part of this [`749f89d`](https://github.com/rdkcentral/rdke-refui/commit/749f89d0af61e7aab7d96cb70a392e4efb8f8020)
+
 #### [5.0.24](https://github.com/rdkcentral/rdke-refui/compare/5.0.20...5.0.24)
 
+> 12 February 2026
+
+- RDKEAPPRT-575 [RDKUI] 5.0.24 Merge latest changes from develop to main, create release tag, and publish release. [`#154`](https://github.com/rdkcentral/rdke-refui/pull/154)
 - RDKEAPPRT-268 [RDK UI] Replace deprecated APIs for USB Media Device [`#153`](https://github.com/rdkcentral/rdke-refui/pull/153)
 - RDKEAPPRT-394 Adopt to New APIs for deprecated ones if not yet [`#151`](https://github.com/rdkcentral/rdke-refui/pull/151)
 - RDKEAPPRT-533-[RDK UI] Device is not discovered via DIAL after re-enabling Local Device Discovery option [`#150`](https://github.com/rdkcentral/rdke-refui/pull/150)
 - RDKEAPPRT-518 All SSIDs are not visible in FTI SSID selection screen [`#149`](https://github.com/rdkcentral/rdke-refui/pull/149)
+- RDKEAPPRT-575 Changelog updates for 5.0.24 [`59d8252`](https://github.com/rdkcentral/rdke-refui/commit/59d8252ac9401f7882716fc5c055346653004996)
 - Merge tag '5.0.20' into develop [`4413c1c`](https://github.com/rdkcentral/rdke-refui/commit/4413c1cf7d14b54c8952299b291a44f311d7033e)
 
 #### [5.0.20](https://github.com/rdkcentral/rdke-refui/compare/5.0.17...5.0.20)

accelerator-home-ui/settings.json

@@ -13,6 +13,6 @@
     "log": true,
     "enableAppSuspended": true,
     "showVersion": false,
-    "version": "5.0.24"
+    "version": "6.0.4"
   }
 }

accelerator-home-ui/src/App.js

@@ -35,6 +35,7 @@ import {
 import Keymap from './Config/Keymap';
 import Menu from './views/Menu'
 import Failscreen from './screens/FailScreen';
+import FailAndOkScreen from './screens/FailAndOkScreen';
 import {
 	keyIntercept
 } from './keyIntercept/keyIntercept';
@@ -193,6 +194,9 @@ export default class App extends Router.App {
 				Fail: {
 					type: Failscreen,
 				},
+				FailOk: {
+					type: FailAndOkScreen,
+				},
 				Volume: {
 					type: Volume
 				},
@@ -251,8 +255,8 @@ export default class App extends Router.App {
 	_captureKey(key) {
 		this.LOG("Got keycode : " + JSON.stringify(key.keyCode))
 		this.LOG("powerState ===>" + JSON.stringify(GLOBALS.powerState))
-		if (GLOBALS.powerState !== "ON") {
-			appApi.setPowerState("ON").then(res => {
+		if (GLOBALS.powerState !== PowerState.POWER_STATE_ON) {
+			appApi.setPowerState(PowerState.POWER_STATE_ON).then(res => {
 				res ? this.LOG("successfully set the power state to ON from " + JSON.stringify(GLOBALS.powerState)) : this.LOG("Failure while turning ON the device")
 				GLOBALS.powerState = PowerState.POWER_STATE_ON;
 				this.LOG("powerState after ===>" + JSON.stringify(GLOBALS.powerState))
@@ -272,6 +276,12 @@ export default class App extends Router.App {
 			if(GLOBALS.MiracastNotificationstatus && key.keyCode !== Keymap.Power && key.keyCode !== Keymap.Home ){
 				return false
 			} else if ((key.keyCode == Keymap.Home || key.keyCode == Keymap.Escape) && !Router.isNavigating()) {
+				if (Router.getActiveHash().startsWith("splash")) {
+					if (Router.getActiveHash() !== "splash/language") {
+						Router.navigate("splash/language");
+					}
+					return true;
+				}
 			if (GLOBALS.topmostApp.includes("dac.native")) {
 				this.jumpToRoute("apps");
 			} else if (GLOBALS.Miracastclientdevicedetails.state === "INITIATED" || GLOBALS.Miracastclientdevicedetails.state === "INPROGRESS ") {
@@ -385,60 +395,24 @@ export default class App extends Router.App {
 			// Remote power key and keyboard F1 key used for STANDBY and POWER_ON
 			return this._powerKeyPressed()
 		} else if (key.keyCode === Keymap.AudioVolumeMute && !Router.isNavigating()) {
-			if (GLOBALS.topmostApp === GLOBALS.selfClientName) {
+			if (GLOBALS.topmostApp === GLOBALS.selfclientAppName) {
 				this.tag("Volume").onVolumeMute();
 			} else {
 				this.LOG("muting on some app")
-				if (Router.getActiveHash() === "applauncher") {
-					this.LOG("muting on some app while route is app launcher")
-					RDKShellApis.moveToFront(GLOBALS.selfClientName)
-					RDKShellApis.setVisibility(GLOBALS.selfClientName, true)
-					this.tag("Volume").onVolumeMute();
-				} else {
-					this.LOG("muting on some app while route is NOT app launcher")
-					RDKShellApis.moveToFront(GLOBALS.selfClientName)
-					RDKShellApis.setVisibility(GLOBALS.selfClientName, true)
-					Router.navigate("applauncher");
-					this.tag("Volume").onVolumeMute();
-				}
 			}
 			return true
 		} else if (key.keyCode == Keymap.AudioVolumeUp && !Router.isNavigating()) {
-			if (GLOBALS.topmostApp === GLOBALS.selfClientName) {
+			if (GLOBALS.topmostApp === GLOBALS.selfclientAppName) {
 				this.tag("Volume").onVolumeKeyUp();
 			} else {
 				this.LOG("muting on some app")
-				if (Router.getActiveHash() === "applauncher") {
-					this.LOG("muting on some app while route is app launcher")
-					RDKShellApis.moveToFront(GLOBALS.selfClientName)
-					RDKShellApis.setVisibility(GLOBALS.selfClientName, true)
-					this.tag("Volume").onVolumeKeyUp();
-				} else {
-					this.LOG("muting on some app while route is NOT app launcher")
-					RDKShellApis.moveToFront(GLOBALS.selfClientName)
-					RDKShellApis.setVisibility(GLOBALS.selfClientName, true)
-					Router.navigate("applauncher");
-					this.tag("Volume").onVolumeKeyUp();
-				}
 			}
 			return true
 		} else if (key.keyCode == Keymap.AudioVolumeDown && !Router.isNavigating()) {
-			if (GLOBALS.topmostApp === GLOBALS.selfClientName) {
+			if (GLOBALS.topmostApp === GLOBALS.selfclientAppName) {
 				this.tag("Volume").onVolumeKeyDown();
 			} else {
 				this.LOG("muting on some app")
-				if (Router.getActiveHash() === "applauncher") {
-					this.LOG("muting on some app while route is app launcher")
-					RDKShellApis.moveToFront(GLOBALS.selfClientName)
-					RDKShellApis.setVisibility(GLOBALS.selfClientName, true)
-					this.tag("Volume").onVolumeKeyDown();
-				} else {
-					this.LOG("muting on some app while route is NOT app launcher")
-					RDKShellApis.moveToFront(GLOBALS.selfClientName)
-					RDKShellApis.setVisibility(GLOBALS.selfClientName, true)
-					Router.navigate("applauncher");
-					this.tag("Volume").onVolumeKeyDown();
-				}
 			}
 			return true
 		} else {
@@ -514,7 +488,7 @@ export default class App extends Router.App {
 			"Prime": "n:2"
 		}
 		this._getPowerStatebeforeReboot();
-		this._registerFireboltListeners()
+		// this._registerFireboltListeners()
 
 		Keyboard.provide('xrn:firebolt:capability:input:keyboard', new KeyboardUIProvider(this))
 		this.LOG("Keyboard provider registered")
@@ -1672,6 +1646,10 @@ export default class App extends Router.App {
 	}
 
 	_PowerStateHandlingWhileReboot() {
+		if (this._oldPowerStateWhileReboot === PowerState.POWER_STATE_STANDBY) {
+			this.LOG("_PowerStateHandlingWhileReboot: oldPowerStateWhileReboot is STANDBY, setting it to ON");
+			this._oldPowerStateWhileReboot = PowerState.POWER_STATE_ON;
+		}
 		this.LOG("_PowerStateHandlingWhileReboot: this._oldPowerStateWhileReboot , " + JSON.stringify(this._oldPowerStateWhileReboot) + " this._powerStateWhileReboot, " + JSON.stringify(this._powerStateWhileReboot) + " ");
 		if (this._oldPowerStateWhileReboot != this._powerStateWhileReboot) {
 			this.LOG("_PowerStateHandlingWhileReboot: old power state is not equal to powerstate while reboot " + JSON.stringify(this._oldPowerStateWhileReboot) + " " + JSON.stringify(this._powerStateWhileReboot));
@@ -1704,32 +1682,32 @@ export default class App extends Router.App {
 			this._getPowerStateWhileReboot();
 		});
 	}
-	_registerFireboltListeners() {
-		FireBoltApi.get().deviceinfo.gettype()
-		FireBoltApi.get().lifecycle.ready()
-
-		FireBoltApi.get().lifecycle.registerEvent('foreground', value => {
-			this.LOG("FireBoltApi[foreground] value:" + JSON.stringify(value) + ", launchResidentApp with:" + JSON.stringify(GLOBALS.selfClientName));
-			// Ripple launches refui with this rdkshell client name.
-			GLOBALS.topmostApp = GLOBALS.selfClientName;
-			FireBoltApi.get().discovery.launch("refui", {
-				"action": "home",
-				"context": {
-					"source": "device"
-				}
-			}).then(() => {
-				AlexaApi.get().reportApplicationState("menu", true);
-			})
-		})
-		FireBoltApi.get().lifecycle.registerEvent('background', value => {
-			// Ripple changed app states; it will be a 'FireboltApp'
-			GLOBALS.topmostApp = "FireboltApp";
-			this.LOG("FireBoltApi[foreground] value:" + JSON.stringify(value) + ", Updating top app as:" + JSON.stringify(GLOBALS.topmostApp));
-		})
-		FireBoltApi.get().lifecycle.state().then(res => {
-			this.LOG("Lifecycle.state result:" + JSON.stringify(res))
-		});
-	}
+	// _registerFireboltListeners() {
+	// 	FireBoltApi.get().deviceinfo.gettype()
+	// 	FireBoltApi.get().lifecycle.ready()
+
+	// 	FireBoltApi.get().lifecycle.registerEvent('foreground', value => {
+	// 		this.LOG("FireBoltApi[foreground] value:" + JSON.stringify(value) + ", launchResidentApp with:" + JSON.stringify(GLOBALS.selfClientName));
+	// 		// Ripple launches refui with this rdkshell client name.
+	// 		GLOBALS.topmostApp = GLOBALS.selfClientName;
+	// 		FireBoltApi.get().discovery.launch("refui", {
+	// 			"action": "home",
+	// 			"context": {
+	// 				"source": "device"
+	// 			}
+	// 		}).then(() => {
+	// 			AlexaApi.get().reportApplicationState("menu", true);
+	// 		})
+	// 	})
+	// 	FireBoltApi.get().lifecycle.registerEvent('background', value => {
+	// 		// Ripple changed app states; it will be a 'FireboltApp'
+	// 		GLOBALS.topmostApp = "FireboltApp";
+	// 		this.LOG("FireBoltApi[foreground] value:" + JSON.stringify(value) + ", Updating top app as:" + JSON.stringify(GLOBALS.topmostApp));
+	// 	})
+	// 	FireBoltApi.get().lifecycle.state().then(res => {
+	// 		this.LOG("Lifecycle.state result:" + JSON.stringify(res))
+	// 	});
+	// }
 
 	_firstEnable() {
 		this.LOG("App Calling listenToVoiceControl method to activate VoiceControl Plugin")
@@ -2124,7 +2102,7 @@ export default class App extends Router.App {
 			appApi.getPowerState().then(res => {
 				GLOBALS.powerState = res ? res.currentState : notification.newState
 			}).catch(e => GLOBALS.powerState = notification.newState)
-			if (notification.newState !== "ON" && notification.currentState === "ON") {
+			if (notification.newState !== PowerState.POWER_STATE_ON && notification.currentState === PowerState.POWER_STATE_ON) {
 				this.LOG("onPowerModeChanged Notification: power state was changed from ON to " + JSON.stringify(notification.newState))
 
 				//TURNING OFF THE DEVICE
@@ -2134,7 +2112,15 @@ export default class App extends Router.App {
 					appApi.exitApp(currentApp); //will suspend/destroy the app depending on the setting.
 				}
 				Router.navigate('menu');
-			} else if (notification.newState === "ON" && notification.currentState !== "ON") {
+			} 
+			else if(notification.newState === PowerState.POWER_STATE_LIGHT_SLEEP && notification.currentState === PowerState.POWER_STATE_DEEP_SLEEP){
+				appApi.setPowerState(PowerState.POWER_STATE_ON).then(res => {	
+					this.LOG("Device woke up from DEEP_SLEEP to LIGHT_SLEEP . setPowerState result: " + JSON.stringify(res))
+				}).catch(err => {
+					this.ERR("Failed to set power state to ON when device woke up from DEEP_SLEEP to LIGHT_SLEEP. Error: " + JSON.stringify(err))
+				})
+			}
+			else if (notification.newState === PowerState.POWER_STATE_ON && notification.currentState !== PowerState.POWER_STATE_ON) {
 				//TURNING ON THE DEVICE
 				Storage.remove(SLEEP_STATE)
 			}
@@ -2852,4 +2838,4 @@ export default class App extends Router.App {
 			}
 		}
 	}
-}
+}

accelerator-home-ui/src/AppController.js

@@ -175,25 +175,15 @@ export default class AppController {
   async addKeyIntercepts(appId, clientId) {
     if (appId === "com.rdkcentral.youtube") {
       try {
+        const intercepts = [
+          { "keyCode": Keymap.AudioVolumeMute, "modifiers": [] },
+          { "keyCode": Keymap.AudioVolumeDown, "modifiers": [] },
+          { "keyCode": Keymap.AudioVolumeUp, "modifiers": [] },
+          { "keyCode": Keymap.Youtube, "modifiers": [] }
+        ];
         await RDKWindowManager.get().addKeyIntercepts({
-          "intercepts": {
-            "intercepts": [{
-              "keys": [{
-                "keyCode": Keymap.AudioVolumeMute,
-                "modifiers": []
-              }, {
-                "keyCode": Keymap.AudioVolumeDown,
-                "modifiers": []
-              }, {
-                "keyCode": Keymap.AudioVolumeUp,
-                "modifiers": []
-              }, {
-                "keyCode": Keymap.Youtube,
-                "modifiers": []
-              }],
-              "client": clientId
-            }]
-          }
+          "clientId": clientId,
+          "intercepts": JSON.stringify(intercepts)
         });
       } catch (err) {
         throw new ThunderError("RDKWindowManager.addKeyIntercepts()", err);

accelerator-home-ui/src/api/AppApi.js

@@ -1607,7 +1607,7 @@ export default class AppApi {
 
   getRFCConfig(rfcParamsList) {
     return new Promise((resolve, reject) => {
-      thunder.call('org.rdk.System', 'getRFCConfig', rfcParamsList).then(result => {
+      thunder.call('org.rdk.System', 'getRFCConfig',{"rfcList":[rfcParamsList]}).then(result => {
         if (result.success) {
           resolve(result)
         } else {