charithag
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issues in AndroidDeviceDAO implementation

Browse Source
revert-dabc3590
harshanL 10 years ago
parent d790260789
commit 7c2a25a1c9
1 changed files with 38 additions and 79 deletions
Show Stats Download Patch File Download Diff File

117
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java
Unescape View File

@ -59,7 +59,7 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
conn = this.getConnection(); conn = this.getConnection();
String selectDBQuery = String selectDBQuery =
"SELECT ANDROID_DEVICE_ID, GCM_TOKEN, DEVICE_INFO, DEVICE_MODEL, SERIAL, VENDOR, MAC_ADDRESS, " + "SELECT ANDROID_DEVICE_ID, GCM_TOKEN, DEVICE_INFO, DEVICE_MODEL, SERIAL, VENDOR, MAC_ADDRESS, " +
"DEVICE_NAME, LATITUDE, LONGITUDE, IMEI, IMSI, 0S_VERSION FROM AD_DEVICE WHERE" + "DEVICE_NAME, LATITUDE, LONGITUDE, IMEI, IMSI, OS_VERSION FROM AD_DEVICE WHERE" +
" ANDROID_DEVICE_ID = ?"; " ANDROID_DEVICE_ID = ?";
stmt = conn.prepareStatement(selectDBQuery); stmt = conn.prepareStatement(selectDBQuery);
stmt.setString(1, mblDeviceId); stmt.setString(1, mblDeviceId);
@ -68,32 +68,22 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
if (resultSet.next()) { if (resultSet.next()) {
mobileDevice = new MobileDevice(); mobileDevice = new MobileDevice();
mobileDevice.setMobileDeviceId(resultSet.getString(AndroidPluginConstants.ANDROID_DEVICE_ID)); mobileDevice.setMobileDeviceId(resultSet.getString(AndroidPluginConstants.ANDROID_DEVICE_ID));
mobileDevice.setModel(resultSet.getString(AndroidPluginConstants.DEVICE_MODEL));
mobileDevice.setSerial(resultSet.getString(AndroidPluginConstants.SERIAL));
mobileDevice.setVendor(resultSet.getString(AndroidPluginConstants.VENDOR));
mobileDevice.setLatitude(resultSet.getString(AndroidPluginConstants.LATITUDE));
mobileDevice.setLongitude(resultSet.getString(AndroidPluginConstants.LONGITUDE));
mobileDevice.setImei(resultSet.getString(AndroidPluginConstants.IMEI));
mobileDevice.setImsi(resultSet.getString(AndroidPluginConstants.IMSI));
mobileDevice.setOsVersion(resultSet.getString(AndroidPluginConstants.OS_VERSION));
Map<String, String> propertyMap = new HashMap<String, String>(); Map<String, String> propertyMap = new HashMap<String, String>();
propertyMap.put(AndroidPluginConstants.GCM_TOKEN, propertyMap.put(AndroidPluginConstants.GCM_TOKEN,
resultSet.getString(AndroidPluginConstants.GCM_TOKEN)); resultSet.getString(AndroidPluginConstants.GCM_TOKEN));
propertyMap.put(AndroidPluginConstants.DEVICE_INFO, propertyMap.put(AndroidPluginConstants.DEVICE_INFO,
resultSet.getString(AndroidPluginConstants.DEVICE_INFO)); resultSet.getString(AndroidPluginConstants.DEVICE_INFO));
propertyMap.put(AndroidPluginConstants.DEVICE_MODEL,
resultSet.getString(AndroidPluginConstants.DEVICE_MODEL));
propertyMap.put(AndroidPluginConstants.SERIAL,
resultSet.getString(AndroidPluginConstants.SERIAL));
propertyMap.put(AndroidPluginConstants.VENDOR,
resultSet.getString(AndroidPluginConstants.VENDOR));
propertyMap.put(AndroidPluginConstants.MAC_ADDRESS,
resultSet.getString(AndroidPluginConstants.MAC_ADDRESS));
propertyMap.put(AndroidPluginConstants.DEVICE_NAME, propertyMap.put(AndroidPluginConstants.DEVICE_NAME,
resultSet.getString(AndroidPluginConstants.DEVICE_NAME)); resultSet.getString(AndroidPluginConstants.DEVICE_NAME));
propertyMap.put(AndroidPluginConstants.LATITUDE,
resultSet.getString(AndroidPluginConstants.LATITUDE));
propertyMap.put(AndroidPluginConstants.LONGITUDE,
resultSet.getString(AndroidPluginConstants.LONGITUDE));
propertyMap.put(AndroidPluginConstants.IMEI,
resultSet.getString(AndroidPluginConstants.IMEI));
propertyMap.put(AndroidPluginConstants.IMSI,
resultSet.getString(AndroidPluginConstants.IMSI));
propertyMap.put(AndroidPluginConstants.OS_VERSION,
resultSet.getString(AndroidPluginConstants.OS_VERSION));
mobileDevice.setDeviceProperties(propertyMap); mobileDevice.setDeviceProperties(propertyMap);
@ -137,26 +127,17 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
AndroidPluginConstants.GCM_TOKEN)); AndroidPluginConstants.GCM_TOKEN));
stmt.setString(3, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(3, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.DEVICE_INFO)); AndroidPluginConstants.DEVICE_INFO));
stmt.setString(4, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(4, mobileDevice.getSerial());
AndroidPluginConstants.SERIAL)); stmt.setString(5, mobileDevice.getVendor());
stmt.setString(5, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(6, mobileDevice.getMobileDeviceId());
AndroidPluginConstants.VENDOR));
stmt.setString(6, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.MAC_ADDRESS));
stmt.setString(7, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(7, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.DEVICE_NAME)); AndroidPluginConstants.DEVICE_NAME));
stmt.setString(8, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(8, mobileDevice.getLongitude());
AndroidPluginConstants.LATITUDE)); stmt.setString(9, mobileDevice.getLongitude());
stmt.setString(9, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(10, mobileDevice.getImsi());
AndroidPluginConstants.LONGITUDE)); stmt.setString(11, mobileDevice.getImsi());
stmt.setString(10, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(12, mobileDevice.getOsVersion());
AndroidPluginConstants.IMEI)); stmt.setString(13, mobileDevice.getModel());
stmt.setString(11, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.IMSI));
stmt.setString(12, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.OS_VERSION));
stmt.setString(13, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.DEVICE_MODEL));
int rows = stmt.executeUpdate(); int rows = stmt.executeUpdate();
if (rows > 0) { if (rows > 0) {
status = true; status = true;
@ -200,26 +181,17 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
AndroidPluginConstants.GCM_TOKEN)); AndroidPluginConstants.GCM_TOKEN));
stmt.setString(2, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(2, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.DEVICE_INFO)); AndroidPluginConstants.DEVICE_INFO));
stmt.setString(3, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(3, mobileDevice.getSerial());
AndroidPluginConstants.SERIAL)); stmt.setString(4, mobileDevice.getVendor());
stmt.setString(4, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(5, mobileDevice.getMobileDeviceId());
AndroidPluginConstants.VENDOR));
stmt.setString(5, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.MAC_ADDRESS));
stmt.setString(6, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(6, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.DEVICE_NAME)); AndroidPluginConstants.DEVICE_NAME));
stmt.setString(7, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(7, mobileDevice.getLatitude());
AndroidPluginConstants.LATITUDE)); stmt.setString(8, mobileDevice.getLongitude());
stmt.setString(8, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(9, mobileDevice.getImei());
AndroidPluginConstants.LONGITUDE)); stmt.setString(10, mobileDevice.getImsi());
stmt.setString(9, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), stmt.setString(11, mobileDevice.getOsVersion());
AndroidPluginConstants.IMEI)); stmt.setString(12, mobileDevice.getModel());
stmt.setString(10, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.IMSI));
stmt.setString(11, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.OS_VERSION));
stmt.setString(12, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(),
AndroidPluginConstants.DEVICE_MODEL));
stmt.setString(13, mobileDevice.getMobileDeviceId()); stmt.setString(13, mobileDevice.getMobileDeviceId());
int rows = stmt.executeUpdate(); int rows = stmt.executeUpdate();
if (rows > 0) { if (rows > 0) {
@ -275,7 +247,7 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
throws MobileDeviceManagementDAOException { throws MobileDeviceManagementDAOException {
Connection conn = null; Connection conn = null;
PreparedStatement stmt = null; PreparedStatement stmt = null;
MobileDevice mobileDevice;
List<MobileDevice> mobileDevices = new ArrayList<MobileDevice>(); List<MobileDevice> mobileDevices = new ArrayList<MobileDevice>();
try { try {
conn = this.getConnection(); conn = this.getConnection();
@ -285,39 +257,26 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{
stmt = conn.prepareStatement(selectDBQuery); stmt = conn.prepareStatement(selectDBQuery);
ResultSet resultSet = stmt.executeQuery(); ResultSet resultSet = stmt.executeQuery();
while (resultSet.next()) { while (resultSet.next()) {
mobileDevice = new MobileDevice();
MobileDevice mobileDevice = new MobileDevice(); mobileDevice.setMobileDeviceId(resultSet.getString(AndroidPluginConstants.ANDROID_DEVICE_ID));
mobileDevice.setMobileDeviceId mobileDevice.setModel(resultSet.getString(AndroidPluginConstants.DEVICE_MODEL));
(resultSet.getString(AndroidPluginConstants.ANDROID_DEVICE_ID)); mobileDevice.setSerial(resultSet.getString(AndroidPluginConstants.SERIAL));
mobileDevice.setVendor(resultSet.getString(AndroidPluginConstants.VENDOR));
mobileDevice.setLatitude(resultSet.getString(AndroidPluginConstants.LATITUDE));
mobileDevice.setLongitude(resultSet.getString(AndroidPluginConstants.LONGITUDE));
mobileDevice.setImei(resultSet.getString(AndroidPluginConstants.IMEI));
mobileDevice.setImsi(resultSet.getString(AndroidPluginConstants.IMSI));
mobileDevice.setOsVersion(resultSet.getString(AndroidPluginConstants.OS_VERSION));
Map<String, String> propertyMap = new HashMap<String, String>(); Map<String, String> propertyMap = new HashMap<String, String>();
propertyMap.put(AndroidPluginConstants.GCM_TOKEN, propertyMap.put(AndroidPluginConstants.GCM_TOKEN,
resultSet.getString(AndroidPluginConstants.GCM_TOKEN)); resultSet.getString(AndroidPluginConstants.GCM_TOKEN));
propertyMap.put(AndroidPluginConstants.DEVICE_INFO, propertyMap.put(AndroidPluginConstants.DEVICE_INFO,
resultSet.getString(AndroidPluginConstants.DEVICE_INFO)); resultSet.getString(AndroidPluginConstants.DEVICE_INFO));
propertyMap.put(AndroidPluginConstants.DEVICE_MODEL,
resultSet.getString(AndroidPluginConstants.DEVICE_MODEL));
propertyMap.put(AndroidPluginConstants.SERIAL,
resultSet.getString(AndroidPluginConstants.SERIAL));
propertyMap.put(AndroidPluginConstants.VENDOR,
resultSet.getString(AndroidPluginConstants.VENDOR));
propertyMap.put(AndroidPluginConstants.MAC_ADDRESS,
resultSet.getString(AndroidPluginConstants.MAC_ADDRESS));
propertyMap.put(AndroidPluginConstants.DEVICE_NAME, propertyMap.put(AndroidPluginConstants.DEVICE_NAME,
resultSet.getString(AndroidPluginConstants.DEVICE_NAME)); resultSet.getString(AndroidPluginConstants.DEVICE_NAME));
propertyMap.put(AndroidPluginConstants.LATITUDE,
resultSet.getString(AndroidPluginConstants.LATITUDE));
propertyMap.put(AndroidPluginConstants.LONGITUDE,
resultSet.getString(AndroidPluginConstants.LONGITUDE));
propertyMap.put(AndroidPluginConstants.IMEI,
resultSet.getString(AndroidPluginConstants.IMEI));
propertyMap.put(AndroidPluginConstants.IMSI,
resultSet.getString(AndroidPluginConstants.IMSI));
propertyMap.put(AndroidPluginConstants.OS_VERSION,
resultSet.getString(AndroidPluginConstants.OS_VERSION));
mobileDevice.setDeviceProperties(propertyMap); mobileDevice.setDeviceProperties(propertyMap);
mobileDevices.add(mobileDevice); mobileDevices.add(mobileDevice);
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {

Write Preview
Loading…
Cancel
Save