Merge branch 'master' into 'master'

Add server version in configuration entries

Closes product-iots#59

See merge request entgra/carbon-device-mgt-plugins!19

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

@@ -15,11 +15,27 @@
  *   specific language governing permissions and limitations
  *   under the License.
  *
+ *   Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ *   Entgra (Pvt) Ltd. 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.services.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.base.ServerConfiguration;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
@@ -29,7 +45,6 @@ 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;
@@ -80,11 +95,18 @@ public class DeviceTypeConfigurationServiceImpl implements DeviceTypeConfigurati
                     DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID, AndroidConstants.
                     TenantConfigProperties.LANGUAGE_US);
 
-            if (license != null && configs != null) {
+            if (configs != null) {
-                entry.setContentType(AndroidConstants.TenantConfigProperties.CONTENT_TYPE_TEXT);
+                ConfigurationEntry versionEntry = new ConfigurationEntry();
-                entry.setName(AndroidConstants.TenantConfigProperties.LICENSE_KEY);
+                versionEntry.setContentType(AndroidConstants.TenantConfigProperties.CONTENT_TYPE_TEXT);
-                entry.setValue(license.getText());
+                versionEntry.setName(AndroidConstants.TenantConfigProperties.SERVER_VERSION);
-                configs.add(entry);
+                versionEntry.setValue(ServerConfiguration.getInstance().getFirstProperty("Version"));
+                configs.add(versionEntry);
+                if (license != null) {
+                    entry.setContentType(AndroidConstants.TenantConfigProperties.CONTENT_TYPE_TEXT);
+                    entry.setName(AndroidConstants.TenantConfigProperties.LICENSE_KEY);
+                    entry.setValue(license.getText());
+                    configs.add(entry);
+                }
                 platformConfiguration.setConfiguration(configs);
             }
         } catch (DeviceManagementException e) {

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

@@ -18,7 +18,7 @@
  *
  * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * Entgra (Pvt) Ltd. 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
@@ -159,6 +159,7 @@ public final class AndroidConstants {
         public static final String LANGUAGE_US = "en_US";
         public static final String CONTENT_TYPE_TEXT = "text";
         public static final String NOTIFIER_FREQUENCY = "notifierFrequency";
+        public static final String SERVER_VERSION = "serverVersion";
     }
 
     public final class ApplicationProperties {