android fixes

Author: legnadev

toolium/driver_wrapper.py

@@ -244,7 +244,13 @@ def connect_selenium(self):
         # Save app_strings in mobile tests
         if (self.is_mobile_test() and not self.is_web_test()
                 and self.config.getboolean_optional('Driver', 'appium_app_strings')):
-            self.app_strings = self.driver.app_strings()
+            try:
+                self.app_strings = self.driver.app_strings()
+                self.logger.debug('App strings retrieved successfully: %d strings found', len(self.app_strings))
+            except Exception as exc:
+                # app_strings() may not be available in some Appium/UIAutomator2 versions or configurations
+                self.logger.warning("Could not retrieve app_strings: %s. Continuing without app strings.", str(exc))
+                self.app_strings = {}
 
         # Resize and move browser
         self.resize_window()

toolium/utils/driver_utils.py

@@ -343,10 +343,39 @@ def swipe(self, element, x, y, duration=0):
         if self.driver_wrapper.is_web_test() or initial_context != 'NATIVE_APP':
             center = self.get_native_coords(center)
 
-        # Android needs absolute end coordinates and ios needs movement
-        end_x = x if self.driver_wrapper.is_ios_test() else center['x'] + x
-        end_y = y if self.driver_wrapper.is_ios_test() else center['y'] + y
-        self.driver_wrapper.driver.swipe(center['x'], center['y'], end_x, end_y, duration)
+        if self.driver_wrapper.is_android_test():
+            end_x = center['x'] + x
+            end_y = center['y'] + y
+
+            width = abs(end_x - center['x'])
+            height = abs(end_y - center['y'])
+
+            if abs(x) > abs(y):
+                direction = 'right' if x > 0 else 'left'
+            else:
+                direction = 'down' if y > 0 else 'up'
+
+            self.driver_wrapper.driver.execute_script('mobile: swipeGesture', {
+                'left': int(center['x'] - width/2) if width > 0 else int(center['x']),
+                'top': int(center['y'] - height/2) if height > 0 else int(center['y']),
+                'width': int(width) if width > 0 else 100,
+                'height': int(height) if height > 0 else 100,
+                'direction': direction,
+                'percent': 1.0,
+                'speed': max(500, 5000 - duration) if duration > 0 else 5000
+            })
+        else:
+            if abs(x) > abs(y):
+                direction = 'right' if x > 0 else 'left'
+            else:
+                direction = 'down' if y > 0 else 'up'
+
+            web_element = self.get_web_element(element)
+
+            self.driver_wrapper.driver.execute_script('mobile: swipe', {
+                'direction': direction,
+                'element': web_element
+            })
 
         if self.driver_wrapper.is_web_test() or initial_context != 'NATIVE_APP':
             self.driver_wrapper.driver.switch_to.context(initial_context)