community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix web clip uninstallation issues in ios

Closes product-iots#276

See merge request entgra/carbon-device-mgt!386
This commit is contained in:
Dharmakeerthi Lasantha 2019-11-07 11:20:52 +00:00
commit c97d633577
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java
View File

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

9
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ios/RemoveApplication.java
View File

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

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/MDMIOSOperationUtil.java
View File

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