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

ADB connect now respects auth keys in the settings page.

Browse Source
This commit is contained in:
Simo Kinnunen
2014-10-01 18:41:18 +09:00
parent 0a67c8c272
commit e6c1de5194
12 changed files with 322 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/units/device/plugins/group.js
View File

@@ -30,7 +30,7 @@ module.exports = syrup.serial()
return currentGroup
})
plugin.join = function(newGroup, timeout) {
plugin.join = function(newGroup, timeout, identifier) {
return plugin.get()
.then(function() {
if (currentGroup.group !== newGroup.group) {
@@ -60,7 +60,7 @@ module.exports = syrup.serial()
))
])
plugin.emit('join', currentGroup)
plugin.emit('join', currentGroup, identifier)
return currentGroup
})
@@ -134,6 +134,15 @@ module.exports = syrup.serial()
])
})
})
.on(wire.AutoGroupMessage, function(channel, message) {
return plugin.join(message.owner, message.timeout, message.identifier)
.then(function() {
plugin.emit('autojoin', message.identifier, true)
})
.catch(grouputil.AlreadyGroupedError, function() {
plugin.emit('autojoin', message.identifier, false)
})
})
.on(wire.UngroupMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
grouputil.match(ident, message.requirements)