mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-09 11:18:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved getCurrentActivity to android-common.js

Browse Source
This commit is contained in:
Chi Thu Le
2013-11-08 20:39:37 +01:00
parent 86060e7c5f
commit f8e2909ed2
3 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/devices/android/android-common.js
View File

@@ -283,5 +283,19 @@ androidCommon.getLogTypes = function(cb) {
});
};
androidCommon.getCurrentActivity = function(cb) {
this.adb.getFocusedPackageAndActivity(function(err, curPackage, activity) {
if (err) {
return cb(null, {
status: status.codes.UnknownError.code
, value: err.message
});
}
cb(null, {
status: status.codes.Success.code
, value: activity
});
});
};
module.exports = androidCommon;

15
lib/devices/android/android-controller.js
View File

@@ -608,21 +608,6 @@ androidController.deleteCookies = function(cb) {
cb(new NotYetImplementedError(), null);
};
androidController.getCurrentActivity = function(cb) {
this.adb.getFocusedPackageAndActivity(function(err, curPackage, activity) {
if (err) {
return cb(null, {
status: status.codes.UnknownError.code
, value: err.message
});
}
cb(null, {
status: status.codes.Success.code
, value: activity
});
});
};
androidController.fastReset = function(cb) {
async.series([
function(cb) { this.adb.stopAndClear(this.appPackage, cb); }.bind(this),

15
lib/devices/android/selendroid.js
View File

@@ -270,21 +270,6 @@ Selendroid.prototype.insertSelendroidManifest = function(serverPath, cb) {
], cb);
};
Selendroid.prototype.getCurrentActivity = function(cb) {
this.adb.getFocusedPackageAndActivity(function(err, curPackage, activity) {
if (err) {
return cb(null, {
status: status.codes.UnknownError.code
, value: err.message
});
}
cb(null, {
status: status.codes.Success.code
, value: activity
});
});
};
Selendroid.prototype = _.extend(Selendroid.prototype, androidCommon);
module.exports = function(opts) {