fix IOS and Android open and close app

Author: MathisSenicourt

source/src/main/java/org/cerberus/core/service/appium/impl/AndroidAppiumService.java

@@ -239,15 +239,9 @@ public MessageEvent removeApp(Session session, String appPackage) throws Illegal
     @Override
     public MessageEvent openApp(Session session, String appPackage, String appActivity) {
 
-        //return executeCommand(session, "mobile:shell", "{'command': 'am start', 'args': ['-n " + appPackage + "/" + appActivity + "']}");
-
         try {
-
-            if (StringUtil.isEmptyOrNull(appPackage)) {
-                ((AndroidDriver) session.getAppiumDriver()).launchApp();
-            } else {
-                ((AndroidDriver) session.getAppiumDriver()).activateApp(appPackage);
-            }
+            AndroidDriver appiumDriver = (AndroidDriver) session.getAppiumDriver();
+            appiumDriver.activateApp(appPackage);
 
             return new MessageEvent(MessageEventEnum.ACTION_SUCCESS_OPENAPP).resolveDescription("APP", appPackage);
 
@@ -264,7 +258,7 @@ public MessageEvent closeApp(Session session) {
         try {
 
             AndroidDriver appiumDriver = (AndroidDriver) session.getAppiumDriver();
-            appiumDriver.terminateApp(appiumDriver.getCurrentPackage());
+            appiumDriver.terminateApp(appiumDriver.getCapabilities().getCapability("appium:bundleId").toString());
 
             return new MessageEvent(MessageEventEnum.ACTION_SUCCESS_CLOSEAPP_GENERIC);
 

source/src/main/java/org/cerberus/core/service/appium/impl/IOSAppiumService.java

@@ -250,12 +250,7 @@ public MessageEvent removeApp(Session session, String appPackage) throws Illegal
     @Override
     public MessageEvent openApp(Session session, String appPackage, String appActivity) {
         try {
-
-            if (StringUtil.isEmptyOrNull(appPackage)) {
-                session.getAppiumDriver().executeScript("mobile: launchApp");//#FIXME SELENIUM #TEST
-            } else {
-                ((IOSDriver) session.getAppiumDriver()).activateApp(appPackage);//#FIXME SELENIUM #TEST (was cast to IOSDriver)
-            }
+            ((IOSDriver) session.getAppiumDriver()).activateApp(appPackage);
 
             return new MessageEvent(MessageEventEnum.ACTION_SUCCESS_OPENAPP).resolveDescription("APP", appPackage);
 
@@ -269,12 +264,9 @@ public MessageEvent openApp(Session session, String appPackage, String appActivi
     @Override
     public MessageEvent closeApp(Session session) {
         try {
-
             IOSDriver appiumDriver = (IOSDriver) session.getAppiumDriver();
 
-//            appiumDriver.terminateApp(appiumDriver.getCapabilities().getCapability("appium:bundleID").toString());
-            appiumDriver.runAppInBackground(Duration.ofSeconds(-1));
-
+            appiumDriver.terminateApp(appiumDriver.getCapabilities().getCapability("appium:bundleId").toString());
 
             return new MessageEvent(MessageEventEnum.ACTION_SUCCESS_CLOSEAPP_GENERIC);