Fixes TIVI-2570 - Unencrypted WiFi connection fails

SettingsApp sends passphrase as null to settings daemon for unprotected networks, which settingsd currently doesn't parse correctly, so patching it to not sending the passphrase in the json request.

Change-Id: Icfa591271729e70583a4003e9bf6ecacae58987e
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/js/api-connman.js b/js/api-connman.js
index e94e338..c991f25 100644 (file)
--- a/js/api-connman.js
+++ b/js/api-connman.js
@@ -77,8 +77,12 @@ settings.connman = (function() {
         {
             'Name': this.prop.Name,
             'Type': this.prop.EncryptionMode,
-            'Passphrase': passphrase
         }]
+
+        if (passphrase) {
+            info[1].Passphrase = passphrase;
+        }
+
         wsAPI.sendRequest(WS_REQUEST_TYPE.CONNMAN_SERVICE, 'connect', info, success_cb, error_cb);
     };
 

diff --git a/packaging/Settings.changes b/packaging/Settings.changes
index 7d7d249..964b30b 100644 (file)
--- a/packaging/Settings.changes
+++ b/packaging/Settings.changes
@@ -1,3 +1,6 @@
+* Fri Jan 10 2014 Jimmy Huang <jimmy.huang@intel.com> submit/tizen_ivi_release/20140108.030030@561a602
+- Fixes TIVI-2570 - Unencrypted WiFi connection fails
+
 * Mon Jan 06 2014 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/20131212.205817@be0921c
 - Fixes TIVI-2484 - Back button in language has no function