diff --git a/lib/roles/device/plugins/account.js b/lib/roles/device/plugins/account.js index 8bca193e..d1da07ac 100644 --- a/lib/roles/device/plugins/account.js +++ b/lib/roles/device/plugins/account.js @@ -48,9 +48,9 @@ module.exports = syrup.serial() router.on(wire.AccountGetMessage, function(channel, message) { var reply = wireutil.reply(options.serial) - log.info('Getting account(s) of type "%s"', message.type) + log.info('Getting account(s)') - service.getAccounts(message.type) + service.getAccounts(message) .timeout(30000) .then(function(accounts) { push.send([ diff --git a/lib/roles/device/plugins/service.js b/lib/roles/device/plugins/service.js index 0f26c48b..d54be848 100644 --- a/lib/roles/device/plugins/service.js +++ b/lib/roles/device/plugins/service.js @@ -490,10 +490,10 @@ module.exports = syrup.serial() }) } - plugin.getAccounts = function(type) { + plugin.getAccounts = function(data) { return runServiceCommand( apk.wire.MessageType.GET_ACCOUNTS - , new apk.wire.GetAccountsRequest(type) + , new apk.wire.GetAccountsRequest({type: data.type}) ) .timeout(15000) .then(function(data) { diff --git a/lib/roles/device/resources/service.js b/lib/roles/device/resources/service.js index d8454625..af0a413c 100644 --- a/lib/roles/device/resources/service.js +++ b/lib/roles/device/resources/service.js @@ -15,7 +15,7 @@ module.exports = syrup.serial() var log = logger.createLogger('device:resources:service') var resource = { - requiredVersion: '0.7.19' + requiredVersion: '0.7.20' , pkg: 'jp.co.cyberagent.stf' , main: 'jp.co.cyberagent.stf.Agent' , apk: pathutil.vendor('STFService/STFService.apk') diff --git a/lib/roles/websocket.js b/lib/roles/websocket.js index 2e72f286..535b178e 100644 --- a/lib/roles/websocket.js +++ b/lib/roles/websocket.js @@ -378,7 +378,7 @@ module.exports = function(options) { channel , wireutil.transaction( responseChannel - , new wire.AccountGetMessage(data.type) + , new wire.AccountGetMessage(data) ) ]) }) diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto index ff3d4d01..cfd5539c 100644 --- a/lib/wire/wire.proto +++ b/lib/wire/wire.proto @@ -406,7 +406,7 @@ message AccountCheckMessage { } message AccountGetMessage { - required string type = 1; + optional string type = 1; } message AccountRemoveMessage { diff --git a/vendor/STFService/STFService.apk b/vendor/STFService/STFService.apk index b0fb39cc..5429ae14 100644 Binary files a/vendor/STFService/STFService.apk and b/vendor/STFService/STFService.apk differ diff --git a/vendor/STFService/wire.proto b/vendor/STFService/wire.proto index 645eed88..ae7b4a0f 100644 --- a/vendor/STFService/wire.proto +++ b/vendor/STFService/wire.proto @@ -180,7 +180,7 @@ message DoIdentifyResponse { } message GetAccountsRequest { - required string type = 1; + optional string type = 1; } message GetAccountsResponse {