starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 16:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

A bit of refactoring and new functionality for removeAccount method.

Browse Source
This commit is contained in:
Valverde Antonio
2014-07-29 16:21:46 +09:00
parent 437596e6c6
commit 1386b438c0
8 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/roles/device/plugins/account.js
View File

@@ -14,12 +14,12 @@ module.exports = syrup.serial()
.define(function(options, service, identity, touch, router, push, adb) {
var log = logger.createLogger('device:plugins:account')
router.on(wire.AccountRemoveMessage, function(channel) {
router.on(wire.AccountRemoveMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
log.info('Removing current Google account(s)')
log.info('Removing "%s" account(s)', message.type)
service.removeAccount()
service.removeAccount(message)
.timeout(30000)
.then(function() {
push.send([

15
lib/roles/device/plugins/service.js
View File

@@ -490,14 +490,17 @@ module.exports = syrup.serial()
})
}
plugin.removeAccount = function() {
plugin.removeAccount = function(data) {
return runServiceCommand(
apk.wire.MessageType.REMOVE_ACCOUNT
, new apk.wire.RemoveAccountRequest()
apk.wire.MessageType.DO_REMOVE_ACCOUNT
, new apk.wire.DoRemoveAccountRequest({
type: data.type
, account: data.account
})
)
.timeout(15000)
.then(function(data) {
var response = apk.wire.RemoveAccountResponse.decode(data)
var response = apk.wire.DoRemoveAccountResponse.decode(data)
if (response.success) {
return true
}
@@ -523,9 +526,7 @@ module.exports = syrup.serial()
plugin.setRingerMode = function(mode) {
return runServiceCommand(
apk.wire.MessageType.SET_RINGER_MODE
, new apk.wire.SetRingerModeRequest(
mode
)
, new apk.wire.SetRingerModeRequest(mode)
)
.timeout(10000)
.then(function(data) {