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

Modify setting app type

Browse Source
This commit is contained in:
Saad Sahibjan 2019-06-07 11:18:07 +05:30
parent c9c4d7a64b
commit 857f9057d3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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

@ -459,9 +459,10 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
//todo rethink and modify the {@link MobileApp} usage //todo rethink and modify the {@link MobileApp} usage
MobileApp mobileApp = new MobileApp(); MobileApp mobileApp = new MobileApp();
MobileAppTypes mobileAppType = MobileAppTypes.valueOf(application.getType());
if (DeviceTypes.ANDROID.toString().equalsIgnoreCase(deviceType)) { if (DeviceTypes.ANDROID.toString().equalsIgnoreCase(deviceType)) {
if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) { if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) {
mobileApp.setType(MobileAppTypes.ENTERPRISE); mobileApp.setType(mobileAppType);
mobileApp.setLocation(application.getApplicationReleases().get(0).getInstallerPath()); mobileApp.setLocation(application.getApplicationReleases().get(0).getInstallerPath());
return MDMAndroidOperationUtil.createInstallAppOperation(mobileApp); return MDMAndroidOperationUtil.createInstallAppOperation(mobileApp);
} else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) { } else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) {

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

@ -48,12 +48,9 @@ public class MDMAndroidOperationUtil {
switch (application.getType()) { switch (application.getType()) {
case ENTERPRISE: case ENTERPRISE:
EnterpriseApplication enterpriseApplication = EnterpriseApplication enterpriseApplication = new EnterpriseApplication();
new EnterpriseApplication();
enterpriseApplication.setType(application.getType().toString()); enterpriseApplication.setType(application.getType().toString());
//TODO: replace needs to be removed after doing the proper config update in application-mgt.xml enterpriseApplication.setUrl(application.getLocation());
enterpriseApplication.setUrl(application.getLocation().replace("https://localhost:9443",
"http://192.168.8.6:9763"));
operation.setPayLoad(enterpriseApplication.toJSON()); operation.setPayLoad(enterpriseApplication.toJSON());
break; break;
case PUBLIC: case PUBLIC: