Merge pull request #910 from shagihan/master

Updates polling period of android devices by an API call.

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.mdm.services.android.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@ApiModel(value = "NotifierFrequency",
+        description = "This class represents notification frequency configuration.")
+public class NotifierFrequency extends AndroidOperation implements Serializable {
+
+    @ApiModelProperty(name = "value", value = "Notification polling frequency", required = true)
+    private int value;
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+}

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

@@ -20,13 +20,20 @@ package org.wso2.carbon.mdm.services.android.services.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+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.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration;
 import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import org.wso2.carbon.mdm.services.android.bean.NotifierFrequency;
 import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
 import org.wso2.carbon.mdm.services.android.services.DeviceTypeConfigurationService;
 import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
@@ -114,6 +121,29 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                     AndroidAPIUtils.getDeviceManagementService().addLicense(DeviceManagementConstants.
                             MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, license);
                     licenseEntry = entry;
+                } else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) {
+                    List<Device> deviceList = AndroidAPIUtils.
+                            getDeviceManagementService().
+                            getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
+                    List<DeviceIdentifier> deviceIdList = new ArrayList<>();
+                    for (Device device : deviceList) {
+                        deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(),device.getType()));
+                    }
+                    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,
+                                operation, deviceIdList);
+                    } else {
+                        return Response.status(Response.Status.BAD_REQUEST)
+                                .entity("No value specified for notifierFrequency.").build();
+                    }
                 }
             }
 
@@ -122,14 +152,29 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
             }
             configuration.setConfiguration(configs);
             AndroidAPIUtils.getDeviceManagementService().saveConfiguration(configuration);
-            //AndroidAPIUtils.getGCMService().resetTenantConfigCache();
         } catch (DeviceManagementException e) {
             msg = "Error occurred while modifying configuration settings of Android platform";
             log.error(msg, e);
             throw new UnexpectedServerErrorException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
+        } catch (NumberFormatException e) {
+            msg = "Error occurred while reading notification frequency.";
+            log.error(msg, e);
+            throw new UnexpectedServerErrorException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
+        } catch (OperationManagementException e) {
+            msg = "Error occurred while modifying configuration settings of Android platform.";
+            log.error(msg, e);
+            throw new UnexpectedServerErrorException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
+        } catch (InvalidDeviceException e) {
+            msg = "Error occurred with the device.";
+            log.error(msg, e);
+            throw new UnexpectedServerErrorException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
         }
-        return Response.status(Response.Status.OK).entity("Android platform configuration has been updated successfully.").build();
+        return Response.status(Response.Status.OK)
+                .entity("Android platform configuration has been updated successfully.").build();
     }
 
 

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

@@ -104,6 +104,7 @@ public final class AndroidConstants {
         public static final String LOGCAT = "LOGCAT";
         public static final String APP_RESTRICTION = "APP-RESTRICTION";
         public static final String WORK_PROFILE = "WORK_PROFILE";
+        public static final String NOTIFIER_FREQUENCY = "NOTIFIER_FREQUENCY";
     }
 
     public final class StatusCodes {
@@ -122,6 +123,7 @@ public final class AndroidConstants {
         public static final String LICENSE_KEY = "androidEula";
         public static final String LANGUAGE_US = "en_US";
         public static final String CONTENT_TYPE_TEXT = "text";
+        public static final String NOTIFIER_FREQUENCY = "notifierFrequency";
     }
 
     public final class ApplicationProperties {

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

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.mdm.services.android.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+@ApiModel(value = "NotifierFrequency",
+        description = "This class represents notification frequency configuration.")
+public class NotifierFrequency extends AndroidOperation implements Serializable {
+
+    @ApiModelProperty(name = "value", value = "Notification polling frequency", required = true)
+    private int value;
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+}

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

@@ -21,13 +21,20 @@ package org.wso2.carbon.mdm.services.android.services.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+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.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.mdm.services.android.bean.AndroidPlatformConfiguration;
 import org.wso2.carbon.mdm.services.android.bean.ErrorResponse;
+import org.wso2.carbon.mdm.services.android.bean.NotifierFrequency;
 import org.wso2.carbon.mdm.services.android.exception.UnexpectedServerErrorException;
 import org.wso2.carbon.mdm.services.android.services.DeviceTypeConfigurationService;
 import org.wso2.carbon.mdm.services.android.util.AndroidAPIUtils;
@@ -115,6 +122,29 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                     AndroidAPIUtils.getDeviceManagementService().addLicense(DeviceManagementConstants.
                             MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, license);
                     licenseEntry = entry;
+                } else if (AndroidConstants.TenantConfigProperties.NOTIFIER_FREQUENCY.equals(entry.getName())) {
+                    List<Device> deviceList = AndroidAPIUtils.
+                            getDeviceManagementService().
+                            getAllDevices(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
+                    List<DeviceIdentifier> deviceIdList = new ArrayList<>();
+                    for (Device device : deviceList) {
+                        deviceIdList.add(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
+                    }
+                    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,
+                                operation, deviceIdList);
+                    } else {
+                        return Response.status(Response.Status.BAD_REQUEST)
+                                .entity("No value specified for notifierFrequency.").build();
+                    }
                 }
             }
 
@@ -129,8 +159,24 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
             log.error(msg, e);
             throw new UnexpectedServerErrorException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
+        } catch (NumberFormatException e) {
+            msg = "Error occurred while reading notification frequency.";
+            log.error(msg, e);
+            throw new UnexpectedServerErrorException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
+        } catch (OperationManagementException e) {
+            msg = "Error occurred while modifying configuration settings of Android platform.";
+            log.error(msg, e);
+            throw new UnexpectedServerErrorException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
+        } catch (InvalidDeviceException e) {
+            msg = "Error occurred with the device.";
+            log.error(msg, e);
+            throw new UnexpectedServerErrorException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
         }
-        return Response.status(Response.Status.OK).entity("Android platform configuration has been updated successfully.").build();
+        return Response.status(Response.Status.OK)
+                .entity("Android platform configuration has been updated successfully.").build();
     }
 
 

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

@@ -104,6 +104,7 @@ public final class AndroidConstants {
         public static final String LOGCAT = "LOGCAT";
         public static final String APP_RESTRICTION = "APP-RESTRICTION";
         public static final String WORK_PROFILE = "WORK_PROFILE";
+        public static final String NOTIFIER_FREQUENCY = "NOTIFIER_FREQUENCY";
     }
 
     public final class StatusCodes {
@@ -122,6 +123,7 @@ public final class AndroidConstants {
         public static final String LICENSE_KEY = "androidEula";
         public static final String LANGUAGE_US = "en_US";
         public static final String CONTENT_TYPE_TEXT = "text";
+        public static final String NOTIFIER_FREQUENCY = "notifierFrequency";
     }
 
     public final class ApplicationProperties {