community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix QR provisioning issue occurs due to wifi sec protocol

See merge request entgra/carbon-device-mgt-plugins!48
merge-requests/49/head^2
Milan Perera 6 years ago
parent 467b6cccb2 162e6c25fa
commit ada26b423d
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File

18
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/configuration.hbs
Unescape View File

@ -91,7 +91,7 @@
<!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>--> <!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>--> <!--</span>-->
<br> <br>
( ex: org.wso2.iot.agent/org.wso2.iot.agent.services.AgentDeviceAdminReceiver ) ( ex: io.entgra.iot.agent/org.wso2.iot.agent.services.AgentDeviceAdminReceiver )
</label> </label>
<input id="android-kiosk-config-admin-component" type="text" class="form-control" > <input id="android-kiosk-config-admin-component" type="text" class="form-control" >
</div> </div>
@ -132,6 +132,22 @@
<input id="android-kiosk-config-wifi-ssid" type="text" class="form-control" > <input id="android-kiosk-config-wifi-ssid" type="text" class="form-control" >
</div> </div>
<div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-wifi-sec">
PROVISIONING_WIFI_SECURITY_TYPE
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">-->
<!--<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>-->
<br>
</label>
<select id="android-kiosk-config-wifi-sec" class="form-control" data-default="0">
<option value="NONE">NONE</option>
<option value="WPA">WPA</option>
<option value="WEP">WEP</option>
<option value="EAP">EAP</option>
</select>
</div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-wifi-password"> <label class="wr-input-label" for="android-kiosk-config-wifi-password">
PROVISIONING_WIFI_PASSWORD PROVISIONING_WIFI_PASSWORD

11
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.platform.configuration/public/js/platform-configuration.js
Unescape View File

@ -84,6 +84,7 @@ var kioskConfigs = {
"adminComponentName" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME", "adminComponentName" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME",
"wifiSSID" : "android.app.extra.PROVISIONING_WIFI_SSID", "wifiSSID" : "android.app.extra.PROVISIONING_WIFI_SSID",
"wifiPassword" : "android.app.extra.PROVISIONING_WIFI_PASSWORD", "wifiPassword" : "android.app.extra.PROVISIONING_WIFI_PASSWORD",
"wifiSecurity" : "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE",
"skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION", "skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION",
"checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM", "checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM",
"downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION" "downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION"
@ -139,6 +140,8 @@ $(document).ready(function () {
$("input#android-kiosk-config-admin-component").val(config.value); $("input#android-kiosk-config-admin-component").val(config.value);
} else if (config.name === kioskConfigs["wifiSSID"]) { } else if (config.name === kioskConfigs["wifiSSID"]) {
$("input#android-kiosk-config-wifi-ssid").val(config.value); $("input#android-kiosk-config-wifi-ssid").val(config.value);
} else if (config.name === kioskConfigs["wifiSecurity"]) {
$("#android-kiosk-config-wifi-sec").val(config.value);
} else if (config.name === kioskConfigs["wifiPassword"]) { } else if (config.name === kioskConfigs["wifiPassword"]) {
$("input#android-kiosk-config-wifi-password").val(config.value); $("input#android-kiosk-config-wifi-password").val(config.value);
} else if (config.name === kioskConfigs["checksum"]) { } else if (config.name === kioskConfigs["checksum"]) {
@ -190,6 +193,7 @@ $(document).ready(function () {
var wifiSSID = $("input#android-kiosk-config-wifi-ssid").val(); var wifiSSID = $("input#android-kiosk-config-wifi-ssid").val();
var wifiPassword = $("input#android-kiosk-config-wifi-password").val(); var wifiPassword = $("input#android-kiosk-config-wifi-password").val();
var encryption = $("#android-kiosk-config-encryption").find("option:selected").attr("value"); var encryption = $("#android-kiosk-config-encryption").find("option:selected").attr("value");
var wifiSecurity = $("#android-kiosk-config-wifi-sec").find("option:selected").attr("value");
if (notifierType === notifierTypeConstants["LOCAL"] && !notifierFrequency) { if (notifierType === notifierTypeConstants["LOCAL"] && !notifierFrequency) {
$(errorMsg).text("Notifier frequency is a required field. It cannot be empty."); $(errorMsg).text("Notifier frequency is a required field. It cannot be empty.");
@ -259,6 +263,12 @@ $(document).ready(function () {
"contentType": "text" "contentType": "text"
}; };
var kioskWifiSecurity = {
"name": kioskConfigs["wifiSecurity"],
"value": wifiSecurity,
"contentType": "text"
};
var kioskWifiPassword = { var kioskWifiPassword = {
"name": kioskConfigs["wifiPassword"], "name": kioskConfigs["wifiPassword"],
"value": wifiPassword, "value": wifiPassword,
@ -281,6 +291,7 @@ $(document).ready(function () {
configList.push(kioskEncryption); configList.push(kioskEncryption);
configList.push(kioskWifiSSID); configList.push(kioskWifiSSID);
configList.push(kioskWifiPassword); configList.push(kioskWifiPassword);
configList.push(kioskWifiSecurity);
if (notifierType === notifierTypeConstants["FCM"]) { if (notifierType === notifierTypeConstants["FCM"]) {
configList.push(fcmKey); configList.push(fcmKey);

3
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/js/type-view.js
Unescape View File

@ -35,6 +35,7 @@ var kioskConfigs = {
"adminComponentName" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME", "adminComponentName" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME",
"wifiSSID" : "android.app.extra.PROVISIONING_WIFI_SSID", "wifiSSID" : "android.app.extra.PROVISIONING_WIFI_SSID",
"wifiPassword" : "android.app.extra.PROVISIONING_WIFI_PASSWORD", "wifiPassword" : "android.app.extra.PROVISIONING_WIFI_PASSWORD",
"wifiSecurity" : "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE",
"skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION", "skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION",
"checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM", "checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM",
"downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION", "downloadURL" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION",
@ -108,6 +109,8 @@ function generateKIOSKQRCode(qrCodeClass) {
payload[config.name] = config.value; payload[config.name] = config.value;
} else if (config.name === kioskConfigs["wifiPassword"]) { } else if (config.name === kioskConfigs["wifiPassword"]) {
payload[config.name] = config.value; payload[config.name] = config.value;
} else if (config.name === kioskConfigs["wifiSecurity"]) {
payload[config.name] = config.value;
} else if (config.name === kioskConfigs["checksum"]) { } else if (config.name === kioskConfigs["checksum"]) {
payload[config.name] = config.value; payload[config.name] = config.value;
} else if (config.name === kioskConfigs["downloadURL"]) { } else if (config.name === kioskConfigs["downloadURL"]) {

Write Preview
Loading…
Cancel
Save