Add IMSI to device details.

louis2610 · Jan 13, 2017 · 5839867 · 5839867
1 parent a4334c5
commit 5839867
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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";