diff --git a/lib/db/api.js b/lib/db/api.js index ea83220c..6480a1d2 100644 --- a/lib/db/api.js +++ b/lib/db/api.js @@ -134,7 +134,7 @@ dbapi.saveDeviceIdentity = function(serial, identity) { , abi: identity.abi , sdk: identity.sdk , display: identity.display - , browsers: identity.browsers + , browser: identity.browser , phone: identity.phone })) } diff --git a/lib/roles/device/plugins/browsers.js b/lib/roles/device/plugins/browser.js similarity index 100% rename from lib/roles/device/plugins/browsers.js rename to lib/roles/device/plugins/browser.js diff --git a/lib/roles/device/plugins/identity.js b/lib/roles/device/plugins/identity.js index 24634e58..2244774d 100644 --- a/lib/roles/device/plugins/identity.js +++ b/lib/roles/device/plugins/identity.js @@ -6,16 +6,16 @@ var logger = require('../../../util/logger') module.exports = syrup.serial() .dependency(require('../support/properties')) .dependency(require('./display')) - .dependency(require('./browsers')) + .dependency(require('./browser')) .dependency(require('./phone')) - .define(function(options, properties, display, browsers, phone) { + .define(function(options, properties, display, browser, phone) { var log = logger.createLogger('device:plugins:identity') function solve() { log.info('Solving identity') var identity = devutil.makeIdentity(options.serial, properties) identity.display = display - identity.browsers = browsers + identity.browser = browser identity.phone = phone return identity } diff --git a/lib/roles/device/plugins/solo.js b/lib/roles/device/plugins/solo.js index bd5c1f91..25cc6b77 100644 --- a/lib/roles/device/plugins/solo.js +++ b/lib/roles/device/plugins/solo.js @@ -42,9 +42,9 @@ module.exports = syrup.serial() , identity.display.secure , identity.display.url ) - , new wire.DeviceBrowsersMessage( - identity.browsers.selected - , identity.browsers.apps.map(function(app) { + , new wire.DeviceBrowserMessage( + identity.browser.selected + , identity.browser.apps.map(function(app) { return new wire.DeviceBrowserAppMessage( app.id , app.type diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto index 1597b3ce..b5dde554 100644 --- a/lib/wire/wire.proto +++ b/lib/wire/wire.proto @@ -143,7 +143,7 @@ message DeviceBrowserAppMessage { required bool selected = 4; } -message DeviceBrowsersMessage { +message DeviceBrowserMessage { required bool selected = 1; repeated DeviceBrowserAppMessage apps = 2; } @@ -165,7 +165,7 @@ message DeviceIdentityMessage { required string abi = 7; required string sdk = 8; required DeviceDisplayMessage display = 9; - required DeviceBrowsersMessage browsers = 10; + required DeviceBrowserMessage browser = 10; required DevicePhoneMessage phone = 11; }