community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored device info function

Browse Source
This commit is contained in:
mharindu 2015-05-19 15:42:35 +05:30
commit 758c6a5f24
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/AndroidDAOFactory.java
View File

@ -21,7 +21,6 @@ package org.wso2.carbon.device.mgt.mobile.impl.android.dao;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants; import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.mobile.config.datasource.MobileDataSourceConfig;
import org.wso2.carbon.device.mgt.mobile.dao.*; import org.wso2.carbon.device.mgt.mobile.dao.*;
import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.AndroidDeviceDAOImpl; import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.AndroidDeviceDAOImpl;
import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.AndroidFeatureDAOImpl; import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.AndroidFeatureDAOImpl;

1
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
View File

@ -28,7 +28,6 @@ public class AndroidUtils {
public static String getDeviceProperty(Map<String, String> deviceProperties, String property) { public static String getDeviceProperty(Map<String, String> deviceProperties, String property) {
String deviceProperty = deviceProperties.get(property); String deviceProperty = deviceProperties.get(property);
if (deviceProperty == null) { if (deviceProperty == null) {
return ""; return "";
} }

2
features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
View File

@ -5,7 +5,7 @@
CREATE TABLE IF NOT EXISTS `AD_DEVICE` ( CREATE TABLE IF NOT EXISTS `AD_DEVICE` (
`ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL , `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
`GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL , `GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL ,
`DEVICE_INFO` VARCHAR(500) NULL DEFAULT NULL , `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL ,
`IMEI` VARCHAR(45) NULL DEFAULT NULL , `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
`IMSI` VARCHAR(45) NULL DEFAULT NULL , `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
`OS_VERSION` VARCHAR(45) NULL DEFAULT NULL , `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,

9
pom.xml
View File

@ -476,9 +476,6 @@
<!-- Mobile Device Management --> <!-- Mobile Device Management -->
<carbon.mobile.device.mgt.version>1.9.2-SNAPSHOT</carbon.mobile.device.mgt.version> <carbon.mobile.device.mgt.version>1.9.2-SNAPSHOT</carbon.mobile.device.mgt.version>
<!-- API Management -->
<carbon.api.mgt.version>1.4.0</carbon.api.mgt.version>
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>
<bouncycastle.version>1.49</bouncycastle.version> <bouncycastle.version>1.49</bouncycastle.version>
@ -611,7 +608,6 @@
<checksumPolicy>ignore</checksumPolicy> <checksumPolicy>ignore</checksumPolicy>
</releases> </releases>
</pluginRepository> </pluginRepository>
<pluginRepository> <pluginRepository>
<id>wso2.snapshots</id> <id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name> <name>Apache Snapshot Repository</name>
@ -653,7 +649,6 @@
<checksumPolicy>ignore</checksumPolicy> <checksumPolicy>ignore</checksumPolicy>
</releases> </releases>
</repository> </repository>
<repository> <repository>
<id>wso2.releases</id> <id>wso2.releases</id>
<name>WSO2 internal Repository</name> <name>WSO2 internal Repository</name>
@ -664,7 +659,6 @@
<checksumPolicy>ignore</checksumPolicy> <checksumPolicy>ignore</checksumPolicy>
</releases> </releases>
</repository> </repository>
<repository> <repository>
<id>wso2.snapshots</id> <id>wso2.snapshots</id>
<name>WSO2 Snapshot Repository</name> <name>WSO2 Snapshot Repository</name>
@ -677,6 +671,5 @@
<enabled>false</enabled> <enabled>false</enabled>
</releases> </releases>
</repository> </repository>
</repositories> </repositories>
</project> </project>