use dumpWindowHierarchy for xml page source as well since it's more r…

…eliable
appium · Apr 9, 2014 · 6af56cb · 6af56cb
1 parent 5b79ece
commit 6af56cb
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/lib/devices/android/android-controller.js b/lib/devices/android/android-controller.js
@@ -455,21 +455,14 @@ androidController.getPageSource = function (cb) {
 
 androidController.getPageSourceXML = function (cb) {
   var xmlFile = temp.path({suffix: '.xml'});
+  var onDeviceXmlPath = this.dataDir + '/local/tmp/dump.xml';
   async.series(
     [
       function (cb) {
-        var cmd = this.adb.adbCmd + ' shell uiautomator dump /data/local/tmp/dump.xml';
-        logger.debug('getPageSourceXML command: ' + cmd);
-        exec(cmd, { maxBuffer: 524288 }, function (err, stdout, stderr) {
-          if (err) {
-            logger.warn(stderr);
-            return cb(err);
-          }
-          cb(null);
-        });
+        this.proxy(["dumpWindowHierarchy"], cb);
       }.bind(this),
       function (cb) {
-        var cmd = this.adb.adbCmd + ' pull /data/local/tmp/dump.xml "' + xmlFile + '"';
+        var cmd = this.adb.adbCmd + ' pull ' + onDeviceXmlPath + ' "' + xmlFile + '"';
         logger.debug('transferPageSourceXML command: ' + cmd);
         exec(cmd, { maxBuffer: 524288 }, function (err, stdout, stderr) {
           if (err) {