Merge pull request #916 from charithag/master

Fixed issue in device type config operation & Add HTTPS support for file transfer

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

@@ -24,6 +24,7 @@ import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -124,18 +125,20 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                 } else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) {
                     List<Device> deviceList = AndroidAPIUtils.
                             getDeviceManagementService().
-                            getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
+                            getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, false);
                     List<DeviceIdentifier> deviceIdList = new ArrayList<>();
                     for (Device device : deviceList) {
+                        if (EnrolmentInfo.Status.REMOVED != device.getEnrolmentInfo().getStatus()) {
                             deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
                         }
+                    }
+                    if (!deviceIdList.isEmpty()) {
                         if (entry.getValue() != null) {
                             NotifierFrequency notifierFrequency = new NotifierFrequency();
                             notifierFrequency.setValue(Integer.parseInt(entry.getValue().toString()));
                             ProfileOperation operation = new ProfileOperation();
                             operation.setCode(AndroidConstants.OperationCodes.NOTIFIER_FREQUENCY);
                             operation.setPayLoad(notifierFrequency.toJSON());
-                        operation.setType(Operation.Type.CONFIG);
                             operation.setEnabled(true);
                             AndroidAPIUtils.getDeviceManagementService().addOperation(
                                     DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID,
@@ -146,6 +149,7 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                         }
                     }
                 }
+            }
 
             if (licenseEntry != null) {
                 configs.remove(licenseEntry);

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.operation-bar/public/js/operation-bar.js

@@ -282,7 +282,7 @@ function validateFileTransferParameters(payload) {
         returnVal = "Please enter File URL";
     } else if (!payload.upload && !payload.fileURL) {
         returnVal = "Please enter the URL to upload file from device";
-    } else if (protocol === "HTTP" && !(payload.fileURL).startsWith("http:")) {
+    } else if (protocol === "HTTP" && !(payload.fileURL.startsWith("http:") || payload.fileURL.startsWith("https:"))) {
         returnVal = "Please enter HTTP URL"
     } else if (protocol === "FTP" && !(payload.fileURL).startsWith("ftp:")) {
         returnVal = "Please enter FTP URL"

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceTypeConfigurationServiceImpl.java

@@ -25,6 +25,7 @@ import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -125,18 +126,20 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                 } else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) {
                     List<Device> deviceList = AndroidAPIUtils.
                             getDeviceManagementService().
-                            getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
+                            getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, false);
                     List<DeviceIdentifier> deviceIdList = new ArrayList<>();
                     for (Device device : deviceList) {
+                        if (EnrolmentInfo.Status.REMOVED != device.getEnrolmentInfo().getStatus()) {
                             deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
                         }
+                    }
+                    if (!deviceIdList.isEmpty()) {
                         if (entry.getValue() != null) {
                             NotifierFrequency notifierFrequency = new NotifierFrequency();
                             notifierFrequency.setValue(Integer.parseInt(entry.getValue().toString()));
                             ProfileOperation operation = new ProfileOperation();
                             operation.setCode(AndroidConstants.OperationCodes.NOTIFIER_FREQUENCY);
                             operation.setPayLoad(notifierFrequency.toJSON());
-                        operation.setType(Operation.Type.CONFIG);
                             operation.setEnabled(true);
                             AndroidAPIUtils.getDeviceManagementService().addOperation(
                                     DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID,
@@ -147,6 +150,7 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                         }
                     }
                 }
+            }
 
             if (licenseEntry != null) {
                 configs.remove(licenseEntry);