diff --git a/lib/units/device/plugins/util/phone.js b/lib/units/device/plugins/util/phone.js index 1ae02289..1afa4a2b 100644 --- a/lib/units/device/plugins/util/phone.js +++ b/lib/units/device/plugins/util/phone.js @@ -11,6 +11,7 @@ module.exports = syrup.serial() log.info('Fetching phone info') return service.getProperties([ 'imei' + , 'imsi' , 'phoneNumber' , 'iccid' , 'network' diff --git a/lib/units/device/resources/service.js b/lib/units/device/resources/service.js index d94f18c9..bf8271ca 100644 --- a/lib/units/device/resources/service.js +++ b/lib/units/device/resources/service.js @@ -17,7 +17,7 @@ module.exports = syrup.serial() pathutil.vendor('STFService/wire.proto')) var resource = { - requiredVersion: '1.1.0' + requiredVersion: '2.0.0' , pkg: 'jp.co.cyberagent.stf' , main: 'jp.co.cyberagent.stf.Agent' , apk: pathutil.vendor('STFService/STFService.apk') diff --git a/lib/util/fakedevice.js b/lib/util/fakedevice.js index 7ec96f8d..966f2d27 100644 --- a/lib/util/fakedevice.js +++ b/lib/util/fakedevice.js @@ -44,6 +44,7 @@ module.exports.generate = function(wantedModel) { , phone: { iccid: '1234567890123456789' , imei: '123456789012345' + , imsi: '123456789012345' , network: 'LTE' , phoneNumber: '0000000000' } diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto index 5de995cd..5362e578 100644 --- a/lib/wire/wire.proto +++ b/lib/wire/wire.proto @@ -208,6 +208,7 @@ message DeviceBrowserMessage { message DevicePhoneMessage { optional string imei = 1; + optional string imsi = 5; optional string phoneNumber = 2; optional string iccid = 3; optional string network = 4; diff --git a/res/app/control-panes/info/info.pug b/res/app/control-panes/info/info.pug index 769d7a08..a8973f0a 100644 --- a/res/app/control-panes/info/info.pug +++ b/res/app/control-panes/info/info.pug @@ -139,6 +139,9 @@ tr td(translate) IMEI td {{device.phone.imei}} + tr + td(translate) IMSI + td {{device.phone.imsi}} tr td(translate) ICCID td diff --git a/res/app/device-list/column/device-column-service.js b/res/app/device-list/column/device-column-service.js index 3a6d3430..9bc88b35 100644 --- a/res/app/device-list/column/device-column-service.js +++ b/res/app/device-list/column/device-column-service.js @@ -192,6 +192,12 @@ module.exports = function DeviceColumnService($filter, gettext) { return device.phone ? device.phone.imei : '' } }) + , imsi: TextCell({ + title: gettext('Phone IMSI') + , value: function(device) { + return device.phone ? device.phone.imsi : '' + } + }) , iccid: TextCell({ title: gettext('Phone ICCID') , value: function(device) { diff --git a/res/app/device-list/device-list-controller.js b/res/app/device-list/device-list-controller.js index d1fb19dc..d7814b00 100644 --- a/res/app/device-list/device-list-controller.js +++ b/res/app/device-list/device-list-controller.js @@ -75,6 +75,10 @@ module.exports = function DeviceListCtrl( name: 'imei' , selected: false } + , { + name: 'imsi' + , selected: false + } , { name: 'iccid' , selected: false diff --git a/vendor/STFService/STFService.apk b/vendor/STFService/STFService.apk index 28ec6240..68220a4f 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 e38b9ac3..f0a03fa0 100644 --- a/vendor/STFService/wire.proto +++ b/vendor/STFService/wire.proto @@ -1,3 +1,5 @@ +syntax = "proto2"; + package jp.co.cyberagent.stf.proto; option java_outer_classname = "Wire";