Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java

@@ -285,6 +285,9 @@ public class AndroidAPIUtils {
                 OperationCodes.DEVICE_INFO.equals(operation.getCode())) {
 
             try {
+                if (log.isDebugEnabled()){
+                    log.debug("Operation response: " + operation.getOperationResponse());
+                }
                 Device device = new Gson().fromJson(operation.getOperationResponse(), Device.class);
                 org.wso2.carbon.device.mgt.common.device.details.DeviceInfo deviceInfo = convertDeviceToInfo(device);
                 updateDeviceInfo(deviceIdentifier, deviceInfo);
@@ -403,8 +406,6 @@ public class AndroidAPIUtils {
                 }
             } else {
                 if (prop.getName().equalsIgnoreCase("CPU_INFO")) {
-                    deviceInfo.setTotalRAMMemory(Double.parseDouble(getProperty(prop.getValue(), "User")));
-
                     deviceInfo.getDeviceDetailsMap().put("cpuUser",
                             getProperty(prop.getValue(), "User"));
                     deviceInfo.getDeviceDetailsMap().put("cpuSystem",

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/webapp/META-INF/permissions.xml

@@ -39,6 +39,13 @@
         <method>GET</method>
     </Permission>
 
+    <Permission>
+        <name>Modify Tenant configuration</name>
+        <path>/device-mgt/admin/platform-configs/add</path>
+        <url>/configuration</url>
+        <method>PUT</method>
+    </Permission>
+
     <Permission>
         <name>Add Tenant configuration</name>
         <path>/device-mgt/admin/platform-configs/add</path>

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js

@@ -19,10 +19,12 @@
 function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var generalConfig = context.app.conf["generalConfig"];
+    var mdmProps = require('/app/conf/reader/main.js')["conf"];
 
-    context["permissions"] = userModule.getUIPermissions();
+    var viewModel = {};
-    new Log().info("## Permissions : "+ stringify(userModule.getUIPermissions()));
+    viewModel.permissions = userModule.getUIPermissions();
-    context["enrollmentURL"] = generalConfig["host"] + generalConfig["enrollmentDir"];
+    new Log().debug("## Permissions : " + stringify(userModule.getUIPermissions()));
-
+    //TODO: Move enrollment URL into app-conf.json
-    return context;
+    viewModel.enrollmentURL = mdmProps.enrollmentUrl;
+    return viewModel;
 }