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

Fixed indentation issues

Browse Source
revert-dabc3590
milanperera 10 years ago
parent b0bc3ff3f1
commit 133bb9a6ea
1 changed files with 107 additions and 111 deletions
Show Stats Download Patch File Download Diff File

218
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
Unescape View File

@ -130,112 +130,108 @@ public class AndroidDeviceManager implements DeviceManager {
return tenantConfiguration; return tenantConfiguration;
} }
@Override @Override
public boolean enrollDevice(Device device) throws DeviceManagementException { public boolean enrollDevice(Device device) throws DeviceManagementException {
boolean status = false; boolean status = false;
MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device); MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
try { try {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Enrolling a new Android device : " + device.getDeviceIdentifier()); log.debug("Enrolling a new Android device : " + device.getDeviceIdentifier());
} }
boolean isEnrolled = this.isEnrolled(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType())); boolean isEnrolled = this.isEnrolled(new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()));
if (isEnrolled) { if (isEnrolled) {
this.modifyEnrollment(device); this.modifyEnrollment(device);
} else { } else {
AndroidDAOFactory.beginTransaction(); AndroidDAOFactory.beginTransaction();
status = daoFactory.getMobileDeviceDAO().addMobileDevice( status = daoFactory.getMobileDeviceDAO().addMobileDevice(mobileDevice);
mobileDevice); AndroidDAOFactory.commitTransaction();
AndroidDAOFactory.commitTransaction(); }
} } catch (MobileDeviceManagementDAOException e) {
} catch (MobileDeviceManagementDAOException e) { try {
try { AndroidDAOFactory.rollbackTransaction();
AndroidDAOFactory.rollbackTransaction(); } catch (MobileDeviceManagementDAOException mobileDAOEx) {
} catch (MobileDeviceManagementDAOException mobileDAOEx) { String msg = "Error occurred while roll back the device enrol transaction :" + device.toString();
String msg = "Error occurred while roll back the device enrol transaction :" + device.toString(); log.warn(msg, mobileDAOEx);
log.warn(msg, mobileDAOEx); }
} String msg = "Error while enrolling the Android device : " + device.getDeviceIdentifier();
String msg = "Error while enrolling the Android device : " + device.getDeviceIdentifier(); log.error(msg, e);
log.error(msg, e); throw new DeviceManagementException(msg, e);
throw new DeviceManagementException(msg, e); }
} return status;
return status; }
}
@Override @Override
public boolean modifyEnrollment(Device device) throws DeviceManagementException { public boolean modifyEnrollment(Device device) throws DeviceManagementException {
boolean status; boolean status;
MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device); MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
try { try {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Modifying the Android device enrollment data"); log.debug("Modifying the Android device enrollment data");
} }
AndroidDAOFactory.beginTransaction(); AndroidDAOFactory.beginTransaction();
status = daoFactory.getMobileDeviceDAO() status = daoFactory.getMobileDeviceDAO().updateMobileDevice(mobileDevice);
.updateMobileDevice(mobileDevice); AndroidDAOFactory.commitTransaction();
AndroidDAOFactory.commitTransaction(); } catch (MobileDeviceManagementDAOException e) {
} catch (MobileDeviceManagementDAOException e) { try {
try { AndroidDAOFactory.rollbackTransaction();
AndroidDAOFactory.rollbackTransaction(); } catch (MobileDeviceManagementDAOException mobileDAOEx) {
} catch (MobileDeviceManagementDAOException mobileDAOEx) { String msg = "Error occurred while roll back the update device transaction :" +
String msg = "Error occurred while roll back the update device transaction :" + device.toString();
device.toString(); log.warn(msg, mobileDAOEx);
log.warn(msg, mobileDAOEx); }
} String msg = "Error while updating the enrollment of the Android device : " +
String msg = "Error while updating the enrollment of the Android device : " + device.getDeviceIdentifier();
device.getDeviceIdentifier(); log.error(msg, e);
log.error(msg, e); throw new DeviceManagementException(msg, e);
throw new DeviceManagementException(msg, e); }
} return status;
return status; }
}
@Override @Override
public boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
boolean status; boolean status;
try { try {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Dis-enrolling Android device : " + deviceId); log.debug("Dis-enrolling Android device : " + deviceId);
} }
AndroidDAOFactory.beginTransaction(); AndroidDAOFactory.beginTransaction();
status = daoFactory.getMobileDeviceDAO() status = daoFactory.getMobileDeviceDAO().deleteMobileDevice(deviceId.getId());
.deleteMobileDevice(deviceId.getId()); AndroidDAOFactory.commitTransaction();
AndroidDAOFactory.commitTransaction(); } catch (MobileDeviceManagementDAOException e) {
} catch (MobileDeviceManagementDAOException e) { try {
try { AndroidDAOFactory.rollbackTransaction();
AndroidDAOFactory.rollbackTransaction(); } catch (MobileDeviceManagementDAOException mobileDAOEx) {
} catch (MobileDeviceManagementDAOException mobileDAOEx) { String msg = "Error occurred while roll back the device dis enrol transaction :" +
String msg = "Error occurred while roll back the device dis enrol transaction :" + deviceId.toString();
deviceId.toString(); log.warn(msg, mobileDAOEx);
log.warn(msg, mobileDAOEx); }
} String msg = "Error while removing the Android device : " + deviceId.getId();
String msg = "Error while removing the Android device : " + deviceId.getId(); log.error(msg, e);
log.error(msg, e); throw new DeviceManagementException(msg, e);
throw new DeviceManagementException(msg, e); }
} return status;
return status; }
}
@Override @Override
public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
boolean isEnrolled = false; boolean isEnrolled = false;
try { try {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Checking the enrollment of Android device : " + deviceId.getId()); log.debug("Checking the enrollment of Android device : " + deviceId.getId());
} }
MobileDevice mobileDevice = MobileDevice mobileDevice =
daoFactory.getMobileDeviceDAO().getMobileDevice( daoFactory.getMobileDeviceDAO().getMobileDevice(deviceId.getId());
deviceId.getId()); if (mobileDevice != null) {
if (mobileDevice != null) { isEnrolled = true;
isEnrolled = true; }
} } catch (MobileDeviceManagementDAOException e) {
} catch (MobileDeviceManagementDAOException e) { String msg = "Error while checking the enrollment status of Android device : " +
String msg = "Error while checking the enrollment status of Android device : " + deviceId.getId();
deviceId.getId(); log.error(msg, e);
log.error(msg, e); throw new DeviceManagementException(msg, e);
throw new DeviceManagementException(msg, e); }
} return isEnrolled;
return isEnrolled; }
}
@Override @Override
public boolean isActive(DeviceIdentifier deviceId) throws DeviceManagementException { public boolean isActive(DeviceIdentifier deviceId) throws DeviceManagementException {
@ -276,11 +272,11 @@ public class AndroidDeviceManager implements DeviceManager {
return false; return false;
} }
@Override @Override
public boolean setStatus(DeviceIdentifier deviceIdentifier, String currentUser, public boolean setStatus(DeviceIdentifier deviceIdentifier, String currentUser,
EnrolmentInfo.Status status) throws DeviceManagementException { EnrolmentInfo.Status status) throws DeviceManagementException {
return false; return false;
} }
@Override @Override
@ -305,9 +301,9 @@ public class AndroidDeviceManager implements DeviceManager {
MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device); MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
// Updating current object features using newer ones // Updating current object features using newer ones
existingMobileDevice.setLatitude(mobileDevice.getLatitude()); existingMobileDevice.setLatitude(mobileDevice.getLatitude());
existingMobileDevice.setLongitude(mobileDevice.getLongitude()); existingMobileDevice.setLongitude(mobileDevice.getLongitude());
existingMobileDevice.setDeviceProperties(mobileDevice.getDeviceProperties()); existingMobileDevice.setDeviceProperties(mobileDevice.getDeviceProperties());
try { try {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {

Write Preview
Loading…
Cancel
Save