inosh
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qr code enrollment issues

Browse Source
revert-dabc3590
Milan Perera 6 years ago
parent e10d78b702
commit f7609b3ada
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File

33
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

@ -80,55 +80,55 @@
<div class="kiosk-inputs"> <div class="kiosk-inputs">
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-1"> <label class="wr-input-label" for="android-kiosk-config-admin-component">
PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">--> <!--<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 class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>--> <!--</span>-->
<br> <br>
( ex: com.emm.android/com.emm.android.DeviceAdminReceiver ) ( ex: org.wso2.iot.agent/org.wso2.iot.agent.services.AgentDeviceAdminReceiver )
</label> </label>
<input id="android-kiosk-config-1" type="text" class="form-control" > <input id="android-kiosk-config-admin-component" type="text" class="form-control" >
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-2"> <label class="wr-input-label" for="android-kiosk-config-checksum">
PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">--> <!--<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 class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>--> <!--</span>-->
<br> <br>
( ex: gJD2YwtOiWJHkSMkkIfLRlj-quNqG1fb6v100QmzM9w= ) ( ex: gJD2YwtOiWJHkSMkkIfLRlj-quNqG1fb6v100QmzM9w= )
</label> </label>
<input id="android-kiosk-config-2" type="text" class="form-control" > <input id="android-kiosk-config-checksum" type="text" class="form-control" >
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-3"> <label class="wr-input-label" for="android-kiosk-config-download-url">
PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">--> <!--<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 class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>--> <!--</span>-->
<br> <br>
( ex: com.emm.android/com.emm.android.DeviceAdminReceiver ) ( ex: http://192.168.8.20:8080/android.apk )
</label> </label>
<input id="android-kiosk-config-3" type="text" class="form-control" > <input id="android-kiosk-config-download-url" type="text" class="form-control" >
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-4"> <label class="wr-input-label" for="android-kiosk-config-wifi-ssid">
PROVISIONING_WIFI_SSID PROVISIONING_WIFI_SSID
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">--> <!--<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 class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>--> <!--</span>-->
<br> <br>
( ex: GuestWiFi ) ( ex: Entgra )
</label> </label>
<input id="android-kiosk-config-4" type="text" class="form-control" > <input id="android-kiosk-config-wifi-ssid" type="text" class="form-control" >
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-5"> <label class="wr-input-label" for="android-kiosk-config-wifi-password">
PROVISIONING_WIFI_PASSWORD PROVISIONING_WIFI_PASSWORD
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">--> <!--<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 class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
@ -136,19 +136,18 @@
<br> <br>
</label> </label>
<input id="android-kiosk-config-5" type="text" class="form-control" > <input id="android-kiosk-config-wifi-password" type="text" class="form-control" >
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-kiosk-config-6"> <label class="wr-input-label" for="android-kiosk-config-encryption">
PROVISIONING_SKIP_ENCRYPTION PROVISIONING_SKIP_ENCRYPTION
<!--<span class="helper" title="Time interval after which Android agent will contact IoT Server each time to fetch data">--> <!--<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 class="wr-help-tip glyphicon glyphicon-question-sign"></span>-->
<!--</span>--> <!--</span>-->
<br> <br>
( ex: gJD2YwtOiWJHkSMkkIfLRlj-quNqG1fb6v100QmzM9w= )
</label> </label>
<select id="android-kiosk-config-6" class="form-control" data-default="0"> <select id="android-kiosk-config-encryption" class="form-control" data-default="0">
<option value="false">false</option> <option value="false">false</option>
<option value="true">true</option> <option value="true">true</option>
</select> </select>

26
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

@ -85,7 +85,7 @@ var kioskConfigs = {
"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",
"skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION", "skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION",
"checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_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"
}; };
@ -136,17 +136,17 @@ $(document).ready(function () {
} else if (config.name === configParams["ANDROID_EULA"]) { } else if (config.name === configParams["ANDROID_EULA"]) {
$("#android-eula").val(config.value); $("#android-eula").val(config.value);
} else if (config.name === kioskConfigs["adminComponentName"]) { } else if (config.name === kioskConfigs["adminComponentName"]) {
$("input#android-kiosk-config-1").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-2").val(config.value); $("input#android-kiosk-config-wifi-ssid").val(config.value);
} else if (config.name === kioskConfigs["wifiPassword"]) { } else if (config.name === kioskConfigs["wifiPassword"]) {
$("input#android-kiosk-config-3").val(config.value); $("input#android-kiosk-config-wifi-password").val(config.value);
} else if (config.name === kioskConfigs["checksum"]) { } else if (config.name === kioskConfigs["checksum"]) {
$("input#android-kiosk-config-4").val(config.value); $("input#android-kiosk-config-checksum").val(config.value);
} else if (config.name === kioskConfigs["downloadURL"]) { } else if (config.name === kioskConfigs["downloadURL"]) {
$("input#android-kiosk-config-5").val(config.value); $("input#android-kiosk-config-download-url").val(config.value);
} else if (config.name === kioskConfigs["skipEncryption"]) { } else if (config.name === kioskConfigs["skipEncryption"]) {
$("#android-kiosk-config-6").val(config.value); $("#android-kiosk-config-encryption").val(config.value);
} }
} }
} }
@ -184,12 +184,12 @@ $(document).ready(function () {
var errorMsg = "#android-config-error-msg span"; var errorMsg = "#android-config-error-msg span";
// KIOSK configs // KIOSK configs
var adminComponentName = $("input#android-kiosk-config-1").val(); var adminComponentName = $("input#android-kiosk-config-admin-component").val();
var checksum = $("input#android-kiosk-config-2").val(); var checksum = $("input#android-kiosk-config-checksum").val();
var downloadUrl = $("input#android-kiosk-config-3").val(); var downloadUrl = $("input#android-kiosk-config-download-url").val();
var wifiSSID = $("input#android-kiosk-config-4").val(); var wifiSSID = $("input#android-kiosk-config-wifi-ssid").val();
var wifiPassword = $("input#android-kiosk-config-5").val(); var wifiPassword = $("input#android-kiosk-config-wifi-password").val();
var encryption = $("#android-kiosk-config-6").find("option:selected").attr("value"); var encryption = $("#android-kiosk-config-encryption").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.");

6
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

@ -36,8 +36,10 @@ var kioskConfigs = {
"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",
"skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION", "skipEncryption" : "android.app.extra.PROVISIONING_SKIP_ENCRYPTION",
"checksum" : "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_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",
"androidExtra" : "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE",
"accessToken" : "android.app.extra.token"
}; };
/* /*

Write Preview
Loading…
Cancel
Save