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

Adding null check for operations response

Browse Source
revert-dabc3590
Ace 9 years ago
parent 55aa1c8113
commit 6425d6ab1a
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File

41
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
Unescape View File

@ -312,26 +312,31 @@ public class AndroidAPIUtils {
private static void updateApplicationList(Operation operation, DeviceIdentifier deviceIdentifier) private static void updateApplicationList(Operation operation, DeviceIdentifier deviceIdentifier)
throws ApplicationManagementException { throws ApplicationManagementException {
// Parsing json string to get applications list. // Parsing json string to get applications list.
JsonElement jsonElement = new JsonParser().parse(operation.getOperationResponse()); if (operation.getOperationResponse() != null) {
JsonArray jsonArray = jsonElement.getAsJsonArray(); JsonElement jsonElement = new JsonParser().parse(operation.getOperationResponse());
Application app; JsonArray jsonArray = jsonElement.getAsJsonArray();
List<Application> applications = new ArrayList<Application>(jsonArray.size()); Application app;
for (JsonElement element : jsonArray) { List<Application> applications = new ArrayList<Application>(jsonArray.size());
app = new Application(); for (JsonElement element : jsonArray) {
app.setName(element.getAsJsonObject(). app = new Application();
get(AndroidConstants.ApplicationProperties.NAME).getAsString()); app.setName(element.getAsJsonObject().
app.setApplicationIdentifier(element.getAsJsonObject(). get(AndroidConstants.ApplicationProperties.NAME).getAsString());
get(AndroidConstants.ApplicationProperties.IDENTIFIER).getAsString()); app.setApplicationIdentifier(element.getAsJsonObject().
app.setPlatform(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID); get(AndroidConstants.ApplicationProperties.IDENTIFIER).getAsString());
if (element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.USS) != null) { app.setPlatform(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
app.setMemoryUsage(element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.USS).getAsInt()); if (element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.USS) != null) {
} app.setMemoryUsage(element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.USS).getAsInt());
if (element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.VERSION) != null) { }
app.setVersion(element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.VERSION).getAsString()); if (element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.VERSION) != null) {
app.setVersion(element.getAsJsonObject().get(AndroidConstants.ApplicationProperties.VERSION).getAsString());
}
applications.add(app);
} }
applications.add(app); getApplicationManagerService().updateApplicationListInstalledInDevice(deviceIdentifier, applications);
} else {
log.error("Operation Response is null.");
} }
getApplicationManagerService().updateApplicationListInstalledInDevice(deviceIdentifier, applications);
} }

Write Preview
Loading…
Cancel
Save