Address try-catch clauses

Author: rjap-salesforce

utam-core/src/main/java/utam/core/selenium/appium/MobileDriverAdapter.java

@@ -24,6 +24,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchWindowException;
 import org.openqa.selenium.Platform;
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import utam.core.driver.Driver;
 import utam.core.driver.DriverConfig;
@@ -192,30 +193,34 @@ private static AppiumDriver checkIOSWebViewContext(
   private static AppiumDriver switchToContext(
       AppiumDriver appiumDriver, String context, String window) {
     SupportsContextSwitching contextSwitcher = (SupportsContextSwitching) appiumDriver;
+    AppiumDriver newDriver = null;
     try {
-      AppiumDriver newDriver = (AppiumDriver) contextSwitcher.context(context);
-      if (window != null) {
-        if (appiumDriver.getCapabilities().getPlatformName().equals(Platform.ANDROID)) {
-          // On emulators if it's the first window and Android < 13, it will fail if tried without
-          // the
-          // 'CDwindow-' prefix.
-          try {
-            newDriver.switchTo().window(window);
-          } catch (NoSuchWindowException e) {
-            warning("Failed to switch to window: " + window);
-            newDriver.switchTo().window("CDwindow-" + window);
-            info("Successfully switched to window: CDwindow-" + window + ", retrying with prefix");
-          }
-        } else {
-          newDriver.switchTo().window(window);
-        }
-      }
-      return newDriver;
-    } catch (Exception e) {
+      newDriver = (AppiumDriver) contextSwitcher.context(context);
+    } catch (WebDriverException e) {
       error(e);
       error("Failed to switch to context: " + context);
     }
-    return null;
+    if (newDriver != null
+        && window != null
+        && appiumDriver.getCapabilities().getPlatformName().equals(Platform.ANDROID)) {
+      // On emulators if it's the first window and Android < 13, it will fail if tried without
+      // the
+      // 'CDwindow-' prefix.
+      try {
+        newDriver.switchTo().window(window);
+      } catch (NoSuchWindowException e1) {
+        warning("Failed to switch to window: " + window);
+        String cdWindow = "CDwindow-" + window;
+        try {
+          newDriver.switchTo().window(cdWindow);
+          info("Successfully switched to window: " + cdWindow + ", retrying with prefix");
+        } catch (NoSuchWindowException e2) {
+          error("Failed to switch to window: " + cdWindow);
+          newDriver = null;
+        }
+      }
+    }
+    return newDriver;
   }
 
   @Override