Fixed drag on device before coordinates are translated

dtmilano · dtmilano · commit d8b67e30471f · 2016-02-17T16:26:53.000-05:00
- Fixed storage location for API &gt;= 23
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -26,7 +26,7 @@
 from com.dtmilano.android.common import profileEnd
 from com.dtmilano.android.concertina import Concertina
 
-__version__ = '11.4.0'
+__version__ = '11.5.0'
 
 import sys
 import threading
@@ -1181,15 +1181,16 @@ def onCtrlK(self, event):
 
     def drag(self, start, end, duration, steps, units=Unit.DIP):
         self.showVignette()
+        # the operation on this current device is always done in PX
+        # so let's do it before any conversion takes place
+        self.device.drag(start, end, duration, steps)
         if units == Unit.DIP:
             x0 = round(start[0] / self.device.display['density'], 2)
             y0 = round(start[1] / self.device.display['density'], 2)
             x1 = round(end[0] / self.device.display['density'], 2)
             y1 = round(end[1] / self.device.display['density'], 2)
             start = (x0, y0)
             end = (x1, y1)
-        # the operation on this current device is always done in PX
-        self.device.drag(start, end, duration, steps)
         if self.vc.uiAutomatorHelper:
             self.printOperation(None, Operation.SWIPE_UI_AUTOMATOR_HELPER, x0, y0, x1, y1, steps, units,
                             self.device.display['orientation'])
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -3209,7 +3209,11 @@ def dump(self, window=-1, sleep=1):
                 if api >= 23:
                     # In API 23 the process' stdout,in and err are connected to the socket not to the pts as in
                     # previous versions, so we can't redirect to /dev/tty
-                    received = self.device.shell('uiautomator dump %s /sdcard/window_dump.xml >/dev/null && cat /sdcard/window_dump.xml' % ('--compressed' if self.compressedDump else ''))
+                    # Also, if we want to write to /sdcard/something it fails event though /sdcard is a symlink
+                    pathname = '/storage/self'
+                    filename = 'window_dump.xml'
+                    cmd = 'uiautomator dump %s %s/%s >/dev/null && cat %s/%s' % ('--compressed' if self.compressedDump else '', pathname, filename, pathname, filename)
+                    received = self.device.shell(cmd)
                 else:
                     # NOTICE:
                     # Using /dev/tty this works even on devices with no sdcard
