From cfdad8f1417fa3c4a38e327ff766b71c0cf8e2ea Mon Sep 17 00:00:00 2001 From: suryag23 Date: Fri, 23 Jan 2026 16:10:30 +0530 Subject: [PATCH 1/3] RDKEAPPRT-394 Adopt to New APIs for deprecated ones if not yet --- accelerator-home-ui/settings.json | 2 +- accelerator-home-ui/src/App.js | 25 ++++++++++++------------- accelerator-home-ui/src/api/AppApi.js | 26 ++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/accelerator-home-ui/settings.json b/accelerator-home-ui/settings.json index 5cb3792..31202c4 100644 --- a/accelerator-home-ui/settings.json +++ b/accelerator-home-ui/settings.json @@ -13,6 +13,6 @@ "log": true, "enableAppSuspended": true, "showVersion": false, - "version": "5.0.22" + "version": "5.0.23" } } diff --git a/accelerator-home-ui/src/App.js b/accelerator-home-ui/src/App.js index 31f8ac6..ffcd8ee 100644 --- a/accelerator-home-ui/src/App.js +++ b/accelerator-home-ui/src/App.js @@ -700,8 +700,8 @@ export default class App extends Router.App { this.SubscribeToHdmiCecSourcevent(result[0].state, self.appIdentifiers) let getfriendlyname, getosdname; setTimeout(() => { - xcastApi.getFriendlyName().then(res => { - getfriendlyname = res.friendlyname; + appApi.getFriendlyName().then(res => { + getfriendlyname = res.friendlyName; this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname)); }).catch(err => { this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err)); @@ -724,8 +724,8 @@ export default class App extends Router.App { cecApi.activate().then(() => { let getfriendlyname, getosdname; setTimeout(() => { - xcastApi.getFriendlyName().then(res => { - getfriendlyname = res.friendlyname; + appApi.getFriendlyName().then(res => { + getfriendlyname = res.friendlyName; this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname)); }).catch(err => { this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err)); @@ -756,18 +756,17 @@ export default class App extends Router.App { console.warn("Xcast plugin activate"); if (result) { this.registerXcastListeners(); - // Update Xcast friendly name let serialnumber = "DefaultSLNO"; let modelName = "RDK" + GLOBALS.deviceType; - await appApi.getSerialNumber().then(async res => { - // Reduce display length; trim to last 6 characters - serialnumber = (res.length < 6) ? res : res.slice(-6); - }); - await this.xcastApi.getModelName().then(model => { - modelName = model + serialnumber; - }); + const serialRes = await appApi.getSerialNumber(); + serialnumber = (serialRes.length < 6) ? serialRes : serialRes.slice(-6); + console.log("Serial number:", serialnumber); + const model = await this.xcastApi.getModelName(); + console.log("Model from getModelName:", model); + modelName = (model || modelName) + serialnumber; + console.log("Combined modelName to set:", modelName); this.LOG("Xcast friendly name to be set: " + JSON.stringify(modelName)); - await this.xcastApi.setFriendlyName(modelName); + await appApi.setFriendlyName(modelName); await this.xcastApi.setEnabled(true).then(res => { GLOBALS.LocalDeviceDiscoveryStatus = true; console.warn("Xcast setEnabled success" + JSON.stringify(res)); diff --git a/accelerator-home-ui/src/api/AppApi.js b/accelerator-home-ui/src/api/AppApi.js index 7ed87fb..3de15a2 100644 --- a/accelerator-home-ui/src/api/AppApi.js +++ b/accelerator-home-ui/src/api/AppApi.js @@ -1529,6 +1529,32 @@ export default class AppApi { }) } + getFriendlyName() { + return new Promise((resolve, reject) => { + thunder.call('org.rdk.System', 'getFriendlyName').then(result => { + if (result.success) resolve(result) + reject(false) + }).catch(err => { + this.ERR("AppAPI getFriendlyName error:", JSON.stringify(err, 3, null)) + Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getFriendlyName " + JSON.stringify(err), false, null) + reject(err) + }) + }) + } + + setFriendlyName(name) { + return new Promise((resolve, reject) => { + thunder.call('org.rdk.System', 'setFriendlyName', { "friendlyName": name }).then(result => { + if (result.success) resolve(result) + reject(false) + }).catch(err => { + this.ERR("AppAPI setFriendlyName error:", JSON.stringify(err, 3, null)) + Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system setFriendlyName " + JSON.stringify(err), false, null) + reject(err) + }) + }) + } + getRFCConfig(rfcParamsList) { return new Promise((resolve, reject) => { thunder.call('org.rdk.System', 'getRFCConfig', rfcParamsList).then(result => { From 667476110c67c14dbd2a93ccf52806ec4d2b3bf8 Mon Sep 17 00:00:00 2001 From: suryag23 Date: Thu, 29 Jan 2026 11:44:34 +0530 Subject: [PATCH 2/3] Addressed review comments --- accelerator-home-ui/src/App.js | 14 +++++++++----- accelerator-home-ui/src/api/AppApi.js | 19 ++++++++++++++----- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/accelerator-home-ui/src/App.js b/accelerator-home-ui/src/App.js index ffcd8ee..b4864cd 100644 --- a/accelerator-home-ui/src/App.js +++ b/accelerator-home-ui/src/App.js @@ -702,9 +702,9 @@ export default class App extends Router.App { setTimeout(() => { appApi.getFriendlyName().then(res => { getfriendlyname = res.friendlyName; - this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname)); + this.LOG("AppApi getFriendlyName :" + JSON.stringify(getfriendlyname)); }).catch(err => { - this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err)); + this.ERR("AppApi getFriendlyName Error: " + JSON.stringify(err)); }) cecApi.getOSDName().then(result => { getosdname = result.name; @@ -726,9 +726,9 @@ export default class App extends Router.App { setTimeout(() => { appApi.getFriendlyName().then(res => { getfriendlyname = res.friendlyName; - this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname)); + this.LOG("AppApi getFriendlyName :" + JSON.stringify(getfriendlyname)); }).catch(err => { - this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err)); + this.ERR("AppApi getFriendlyName Error: " + JSON.stringify(err)); }) cecApi.getOSDName().then(result => { getosdname = result.name; @@ -766,7 +766,11 @@ export default class App extends Router.App { modelName = (model || modelName) + serialnumber; console.log("Combined modelName to set:", modelName); this.LOG("Xcast friendly name to be set: " + JSON.stringify(modelName)); - await appApi.setFriendlyName(modelName); + try { + await appApi.setFriendlyName(modelName); + } catch (err) { + this.ERR("AppApi setFriendlyName error: " + JSON.stringify(err) + " - continuing Xcast activation"); + } await this.xcastApi.setEnabled(true).then(res => { GLOBALS.LocalDeviceDiscoveryStatus = true; console.warn("Xcast setEnabled success" + JSON.stringify(res)); diff --git a/accelerator-home-ui/src/api/AppApi.js b/accelerator-home-ui/src/api/AppApi.js index 3de15a2..d9dddda 100644 --- a/accelerator-home-ui/src/api/AppApi.js +++ b/accelerator-home-ui/src/api/AppApi.js @@ -1532,8 +1532,11 @@ export default class AppApi { getFriendlyName() { return new Promise((resolve, reject) => { thunder.call('org.rdk.System', 'getFriendlyName').then(result => { - if (result.success) resolve(result) - reject(false) + if (result.success) { + resolve(result) + } else { + reject(result.success) + } }).catch(err => { this.ERR("AppAPI getFriendlyName error:", JSON.stringify(err, 3, null)) Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getFriendlyName " + JSON.stringify(err), false, null) @@ -1545,8 +1548,11 @@ export default class AppApi { setFriendlyName(name) { return new Promise((resolve, reject) => { thunder.call('org.rdk.System', 'setFriendlyName', { "friendlyName": name }).then(result => { - if (result.success) resolve(result) - reject(false) + if (result.success) { + resolve(result) + } else { + reject(result.success) + } }).catch(err => { this.ERR("AppAPI setFriendlyName error:", JSON.stringify(err, 3, null)) Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system setFriendlyName " + JSON.stringify(err), false, null) @@ -1559,7 +1565,10 @@ export default class AppApi { return new Promise((resolve, reject) => { thunder.call('org.rdk.System', 'getRFCConfig', rfcParamsList).then(result => { if (result.success) resolve(result) - reject(false) + else{ + reject(false) + } + }).catch(err => { this.ERR("AppAPI getRFCConfig error:", JSON.stringify(err, 3, null)) Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getRFCConfig " + JSON.stringify(err), false, null) From af67f5e2a6395d7832e1f7b32b48cf3c42b7d728 Mon Sep 17 00:00:00 2001 From: suryag23 Date: Thu, 29 Jan 2026 14:37:04 +0530 Subject: [PATCH 3/3] Addressed review comments --- accelerator-home-ui/src/App.js | 3 --- accelerator-home-ui/src/api/AppApi.js | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/accelerator-home-ui/src/App.js b/accelerator-home-ui/src/App.js index b4864cd..e9fb667 100644 --- a/accelerator-home-ui/src/App.js +++ b/accelerator-home-ui/src/App.js @@ -760,11 +760,8 @@ export default class App extends Router.App { let modelName = "RDK" + GLOBALS.deviceType; const serialRes = await appApi.getSerialNumber(); serialnumber = (serialRes.length < 6) ? serialRes : serialRes.slice(-6); - console.log("Serial number:", serialnumber); const model = await this.xcastApi.getModelName(); - console.log("Model from getModelName:", model); modelName = (model || modelName) + serialnumber; - console.log("Combined modelName to set:", modelName); this.LOG("Xcast friendly name to be set: " + JSON.stringify(modelName)); try { await appApi.setFriendlyName(modelName); diff --git a/accelerator-home-ui/src/api/AppApi.js b/accelerator-home-ui/src/api/AppApi.js index d9dddda..e20157b 100644 --- a/accelerator-home-ui/src/api/AppApi.js +++ b/accelerator-home-ui/src/api/AppApi.js @@ -1535,7 +1535,9 @@ export default class AppApi { if (result.success) { resolve(result) } else { - reject(result.success) + const error = new Error('getFriendlyName failed: success=false'); + error.result = result; + reject(error) } }).catch(err => { this.ERR("AppAPI getFriendlyName error:", JSON.stringify(err, 3, null)) @@ -1551,7 +1553,9 @@ export default class AppApi { if (result.success) { resolve(result) } else { - reject(result.success) + const error = new Error('setFriendlyName failed: success=false'); + error.result = result; + reject(error) } }).catch(err => { this.ERR("AppAPI setFriendlyName error:", JSON.stringify(err, 3, null)) @@ -1564,11 +1568,13 @@ export default class AppApi { getRFCConfig(rfcParamsList) { return new Promise((resolve, reject) => { thunder.call('org.rdk.System', 'getRFCConfig', rfcParamsList).then(result => { - if (result.success) resolve(result) - else{ - reject(false) + if (result.success) { + resolve(result) + } else { + const error = new Error('getRFCConfig failed: success=false'); + error.result = result; + reject(error) } - }).catch(err => { this.ERR("AppAPI getRFCConfig error:", JSON.stringify(err, 3, null)) Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getRFCConfig " + JSON.stringify(err), false, null)