From 5764fac96708e70b59b51af30fdc7646d6e30d63 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Fri, 10 Jan 2014 14:03:33 -0800 Subject: [PATCH] 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 --- js/api-connman.js | 6 +++++- packaging/Settings.changes | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/js/api-connman.js b/js/api-connman.js index e94e338..c991f25 100644 --- 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 --- a/packaging/Settings.changes +++ b/packaging/Settings.changes @@ -1,3 +1,6 @@ +* Fri Jan 10 2014 Jimmy Huang submit/tizen_ivi_release/20140108.030030@561a602 +- Fixes TIVI-2570 - Unencrypted WiFi connection fails + * Mon Jan 06 2014 Jimmy Huang accepted/tizen/20131212.205817@be0921c - Fixes TIVI-2484 - Back button in language has no function -- 2.7.4