Merge branch 'master' into 'master'

Fix web clip uninstallation issues in ios

Closes product-iots#276

See merge request entgra/carbon-device-mgt!386
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit c97d633577

@ -985,6 +985,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
} else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) {
app.setType(mobileAppType);
app.setIdentifier(application.getPackageName());
app.setLocation(application.getApplicationReleases().get(0).getInstallerPath());
return MDMIOSOperationUtil.createAppUninstallOperation(app);
} else {
String msg = "Invalid Action is found. Action: " + action;

@ -25,6 +25,7 @@ import java.io.Serializable;
public class RemoveApplication implements Serializable {
private String bundleId;
private String url;
public String getBundleId() {
return bundleId;
@ -34,6 +35,14 @@ public class RemoveApplication implements Serializable {
this.bundleId = bundleId;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String toJSON() {
Gson gson = new Gson();
return gson.toJson(this);

@ -96,9 +96,9 @@ public class MDMIOSOperationUtil {
operation.setCode(MDMAppConstants.IOSConstants.OPCODE_REMOVE_APPLICATION);
operation.setType(Operation.Type.PROFILE);
RemoveApplication removeApplication =
new RemoveApplication();
RemoveApplication removeApplication = new RemoveApplication();
removeApplication.setBundleId(application.getIdentifier());
removeApplication.setUrl(application.getLocation());
operation.setPayLoad(removeApplication.toJSON());
return operation;

Loading…
Cancel
Save