RDKEMW-13125: Wi‑Fi in the picker are not ordered by signalstrength

definition/NetworkManager.json

@@ -128,18 +128,18 @@
         },
         "strength":{
             "summary": "The WiFi Signal RSSI value in dBm",
-            "type": "string",
-            "example": "-32"
+            "type": "integer",
+            "example": -32
         },
         "noise":{
             "summary": "The WiFi Signal Noise detected in dBm",
-            "type": "string",
-            "example": "-96"
+            "type": "integer",
+            "example": -96
         },
         "snr":{
             "summary": "Signal to Noise Ratio(SNR) in dBm",
-            "type": "string",
-            "example": "74"
+            "type": "integer",
+            "example": 74
         },
         "quality":{
             "summary": "WiFi Quality based on Signal to Noise Ratio (SNR)",
@@ -148,8 +148,8 @@
         },
         "frequency":{
             "summary": "The supported frequency for this SSID in GHz",
-            "type": "string",
-            "example": "2.4420"
+            "type": "number",
+            "example": 2.4420
         },
         "errors": {
             "summary": "Error string of scan failure",
@@ -1109,8 +1109,8 @@
                     },
                     "rate":{
                         "summary": "The physical data rate in Mbps",
-                        "type": "string",
-                        "example": "144"
+                        "type": "integer",
+                        "example": 144
                     },
                     "noise":{
                         "$ref": "#/definitions/noise"

docs/NetworkManagerPlugin.md

@@ -1367,10 +1367,10 @@ This method takes no parameters.
 | result.ssid | string | The WiFi SSID Name |
 | result.bssid | string | The BSSID of given SSID |
 | result.security | string | The security mode. See the `connect` method |
-| result.strength | string | The WiFi Signal RSSI value in dBm |
-| result.frequency | string | The supported frequency for this SSID in GHz |
-| result.rate | string | The physical data rate in Mbps |
-| result.noise | string | The WiFi Signal Noise detected in dBm |
+| result.strength | integer | The WiFi Signal RSSI value in dBm |
+| result.frequency | number | The supported frequency for this SSID in GHz |
+| result.rate | integer | The physical data rate in Mbps |
+| result.noise | integer | The WiFi Signal Noise detected in dBm |
 | result.success | boolean | Whether the request succeeded |
 
 ### Example
@@ -1395,10 +1395,10 @@ This method takes no parameters.
     "ssid": "myHomeSSID",
     "bssid": "AA:BB:CC:DD:EE:FF",
     "security": "2",
-    "strength": "-32",
-    "frequency": "2.4420",
-    "rate": "144",
-    "noise": "-96",
+    "strength": -32,
+    "frequency": 2.442,
+    "rate": 144,
+    "noise": -96,
     "success": true
   }
 }
@@ -1524,9 +1524,9 @@ This method takes no parameters.
 | result | object |  |
 | result.ssid | string | The WiFi SSID Name |
 | result.quality | string | WiFi Quality based on Signal to Noise Ratio (SNR) |
-| result.snr | string | Signal to Noise Ratio(SNR) in dBm |
-| result.strength | string | The WiFi Signal RSSI value in dBm |
-| result.noise | string | The WiFi Signal Noise detected in dBm |
+| result.snr | integer | Signal to Noise Ratio(SNR) in dBm |
+| result.strength | integer | The WiFi Signal RSSI value in dBm |
+| result.noise | integer | The WiFi Signal Noise detected in dBm |
 | result.success | boolean | Whether the request succeeded |
 
 ### Example
@@ -1550,9 +1550,9 @@ This method takes no parameters.
   "result": {
     "ssid": "myHomeSSID",
     "quality": "Excellent",
-    "snr": "74",
-    "strength": "-32",
-    "noise": "-96",
+    "snr": 74,
+    "strength": -32,
+    "noise": -96,
     "success": true
   }
 }
@@ -1872,8 +1872,8 @@ Triggered when scan completes or when scan cancelled.
 | params.ssids[#] | object |  |
 | params.ssids[#].ssid | string | Discovered SSID |
 | params.ssids[#].security | integer | The security mode. See `GetSupportedSecurityModes` |
-| params.ssids[#].strength | string | The WiFi Signal RSSI value in dBm |
-| params.ssids[#].frequency | string | The supported frequency for this SSID in GHz |
+| params.ssids[#].strength | integer | The WiFi Signal RSSI value in dBm |
+| params.ssids[#].frequency | number | The supported frequency for this SSID in GHz |
 
 ### Example
 
@@ -1886,8 +1886,8 @@ Triggered when scan completes or when scan cancelled.
       {
         "ssid": "myAP-2.4",
         "security": 2,
-        "strength": "-32",
-        "frequency": "2.4420"
+        "strength": -32,
+        "frequency": 2.442
       }
     ]
   }
@@ -1932,9 +1932,9 @@ Triggered when WIFI Signal quality changed which is decided based on SNR value w
 | params | object |  |
 | params.ssid | string | The WiFi SSID Name |
 | params.quality | string | WiFi Quality based on Signal to Noise Ratio (SNR) |
-| params.snr | string | Signal to Noise Ratio(SNR) in dBm |
-| params.strength | string | The WiFi Signal RSSI value in dBm |
-| params.noise | string | The WiFi Signal Noise detected in dBm |
+| params.snr | integer | Signal to Noise Ratio(SNR) in dBm |
+| params.strength | integer | The WiFi Signal RSSI value in dBm |
+| params.noise | integer | The WiFi Signal Noise detected in dBm |
 
 ### Example
 
@@ -1945,9 +1945,9 @@ Triggered when WIFI Signal quality changed which is decided based on SNR value w
   "params": {
     "ssid": "myHomeSSID",
     "quality": "Excellent",
-    "snr": "74",
-    "strength": "-32",
-    "noise": "-96"
+    "snr": 74,
+    "strength": -32,
+    "noise": -96
   }
 }
 ```

interface/INetworkManager.h

@@ -130,10 +130,10 @@ namespace WPEFramework
                     string             ssid;
                     string             bssid;
                     WIFISecurityMode   security;
-                    string             strength;
-                    string             frequency;
-                    string             rate;
-                    string             noise;
+                    int32_t            strength;
+                    double             frequency;
+                    int32_t            rate;
+                    int32_t            noise;
             };
 
             struct EXTERNAL WIFISecurityModeInfo {
@@ -252,7 +252,7 @@ namespace WPEFramework
             virtual uint32_t StartWPS(const WiFiWPS& method /* @in */, const string& pin /* @in */) = 0;
             virtual uint32_t StopWPS(void) = 0;
             virtual uint32_t GetWifiState(WiFiState &state /* @out */) = 0;
-            virtual uint32_t GetWiFiSignalQuality(string& ssid /* @out */, string& strength /* @out */, string& noise /* @out */, string& snr /* @out */, WiFiSignalQuality& quality /* @out */) = 0;
+            virtual uint32_t GetWiFiSignalQuality(string& ssid /* @out */, int& strength /* @out */, int& noise /* @out */, int& snr /* @out */, WiFiSignalQuality& quality /* @out */) = 0;
             virtual uint32_t GetSupportedSecurityModes(ISecurityModeIterator*& modes/* @out */) const = 0;
 
             /* @brief Set the network manager plugin log level */
@@ -268,15 +268,16 @@ namespace WPEFramework
                 enum { ID = ID_NETWORKMANAGER_NOTIFICATION };
 
                 // Network Notifications that other processes can subscribe to
-                virtual void onInterfaceStateChange(const InterfaceState state /* @in */, const string interface /* @in */) = 0;
-                virtual void onActiveInterfaceChange(const string prevActiveInterface /* @in */, const string currentActiveInterface /* @in */) = 0;
-                virtual void onIPAddressChange(const string interface /* @in */, const string ipversion /* @in */, const string ipaddress /* @in */, const IPStatus status /* @in */) = 0;
-                virtual void onInternetStatusChange(const InternetStatus prevState /* @in */, const InternetStatus currState /* @in */, const string interface /* @in */) = 0;
+                virtual void onInterfaceStateChange(const InterfaceState state /* @in */, const string interface /* @in */){};
+                virtual void onActiveInterfaceChange(const string prevActiveInterface /* @in */, const string currentActiveInterface /* @in */){};
+                virtual void onIPAddressChange(const string interface /* @in */, const string ipversion /* @in */, const string ipaddress /* @in */, const IPStatus status /* @in */){};
+                virtual void onInternetStatusChange(const InternetStatus prevState /* @in */, const InternetStatus currState /* @in */, const string interface /* @in */){};
 
                 // WiFi Notifications that other processes can subscribe to
-                virtual void onAvailableSSIDs(const string jsonOfScanResults /* @in */) = 0;
-                virtual void onWiFiStateChange(const WiFiState state /* @in */) = 0;
-                virtual void onWiFiSignalQualityChange(const string ssid /* @in */, const string strength /* @in */, const string noise /* @in */, const string snr /* @in */, const WiFiSignalQuality quality /* @in */) = 0;
+                virtual void onAvailableSSIDs(const string jsonOfScanResults /* @in */){};
+                virtual void onWiFiStateChange(const WiFiState state /* @in */){};
+                virtual void onWiFiSignalQualityChange(const string ssid /* @in */, const int strength /* @in */, const int noise /* @in */, const int snr /* @in */, const WiFiSignalQuality quality /* @in */){};
+                virtual void onWiFiSignalQualityChange(const string ssid /* @in */, const string strength /* @in */, const string noise /* @in */, const string snr /* @in */, const WiFiSignalQuality quality /* @in */){};
             };
 
             // Allow other processes to register/unregister from our notifications

legacy/LegacyWiFiManagerAPIs.cpp

@@ -400,11 +400,12 @@ namespace WPEFramework
             {
                 response["ssid"] = ssidInfo.ssid;
                 response["bssid"] = ssidInfo.bssid;
-                response["rate"] = ssidInfo.rate;
-                response["noise"] = ssidInfo.noise;
+                response["rate"] = to_string(ssidInfo.rate);
+                response["noise"] = to_string(ssidInfo.noise);
                 response["security"] = JsonValue(mapToLegacySecurityMode(ssidInfo.security));
-                response["signalStrength"] = ssidInfo.strength;
-                response["frequency"] = ssidInfo.frequency;
+                response["signalStrength"] = to_string(ssidInfo.strength);
+                std::string freqStr = to_string(ssidInfo.frequency);
+                response["frequency"] = freqStr.substr(0, 3);
             }
             returnJson(rc);
         }
@@ -911,10 +912,15 @@ namespace WPEFramework
             {
                 JsonObject object = ssids[i].Object();
                 uint32_t security = object["security"].Number();
-                object["security"] = mapToLegacySecurityMode(security);
-                ssidsUpdated.Add(object);
+                JsonObject newObject;
+                newObject["ssid"] = object["ssid"];
+                newObject["security"] = mapToLegacySecurityMode(security);
+                newObject["signalStrength"] = object["strength"];
+                newObject["frequency"] = object["frequency"];
+                ssidsUpdated.Add(newObject);
             }
             newParameters["ssids"] = ssidsUpdated;
+            newParameters["moreData"] = false;
 
             newParameters.ToString(json);
             NMLOG_INFO("Event with %d SSIDs as, %s", ssids.Length(), json.c_str());

plugin/NetworkManager.h

@@ -94,7 +94,7 @@ namespace WPEFramework
                     _parent.onWiFiStateChange(state);
                 }
 
-                void onWiFiSignalQualityChange(const string ssid, const string strength, const string noise, const string snr, const Exchange::INetworkManager::WiFiSignalQuality quality) override
+                void onWiFiSignalQualityChange(const string ssid, const int strength, const int noise, const int snr, const Exchange::INetworkManager::WiFiSignalQuality quality) override
                 {
                     _parent.onWiFiSignalQualityChange(ssid, strength, noise, snr, quality);
                 }
@@ -262,7 +262,7 @@ namespace WPEFramework
             void onInternetStatusChange(const Exchange::INetworkManager::InternetStatus prevState, const Exchange::INetworkManager::InternetStatus currState, const string interface);
             void onAvailableSSIDs(const string jsonOfScanResults);
             void onWiFiStateChange(const Exchange::INetworkManager::WiFiState state);
-            void onWiFiSignalQualityChange(const string ssid, const string strength, const string noise, const string snr, const Exchange::INetworkManager::WiFiSignalQuality quality);
+            void onWiFiSignalQualityChange(const string ssid, const int strength, const int noise, const int snr, const Exchange::INetworkManager::WiFiSignalQuality quality);
 
         private:
             uint32_t _connectionId;