Better decode of EF.UST, EF.EST and EF.IST
So far, we only returned an array of service numbers like
[ 2, 4, 5, 9 ] which is not very friendly to the human reader.
In EF.SST we already had more verbose decoding including a description
of each service. Let's add the same principle to EF.UST, EST and IST
The same output above now looks like this:
{
"1": {
"description": "Local Phone Book",
"activated": false
},
"2": {
"description": "Fixed Dialling Numbers (FDN)",
"activated": true
},
"3": {
"description": "Extension 2",
"activated": false
},
"4": {
"description": "Service Dialling Numbers (SDN)",
"activated": true
},
"5": {
"description": "Extension3",
"activated": true
},
"6": {
"description": "Barred Dialling Numbers (BDN)",
"activated": false
},
"7": {
"description": "Extension4",
"activated": false
},
"9": {
"description": "Incoming Call Information (ICI and ICT)",
"activated": true
}
}
Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76
diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py
index 9c7843f..6b69990 100644
--- a/pySim/ts_31_103.py
+++ b/pySim/ts_31_103.py
@@ -26,7 +26,7 @@
from pySim.utils import *
from pySim.tlv import *
from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP
-from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred
+from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred, EF_UServiceTable
import pySim.ts_102_221
from pySim.ts_102_221 import EF_ARR
@@ -101,26 +101,6 @@
super().__init__(fid=fid, sfid=sfid, name=name, desc=desc)
self._tlv = EF_IMPU.impu
-# TS 31.103 Section 4.2.7
-class EF_IST(TransparentEF):
- def __init__(self, fid='6f07', sfid=0x07, name='EF.IST', desc='ISIM Service Table'):
- super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size={1,4})
- # add those commands to the general commands of a TransparentEF
- self.shell_commands += [self.AddlShellCommands()]
-
- @with_default_category('File-Specific Commands')
- class AddlShellCommands(CommandSet):
- def __init__(self):
- super().__init__()
-
- def do_ist_service_activate(self, arg):
- """Activate a service within EF.IST"""
- self._cmd.card.update_ist(int(arg), 1)
-
- def do_ist_service_deactivate(self, arg):
- """Deactivate a service within EF.IST"""
- self._cmd.card.update_ist(int(arg), 0)
-
# TS 31.103 Section 4.2.8
class EF_PCSCF(LinFixedEF):
def __init__(self, fid='6f09', sfid=None, name='EF.P-CSCF', desc='P-CSCF Address'):
@@ -192,7 +172,7 @@
EF_IMPU(),
EF_AD(),
EF_ARR('6f06', 0x06),
- EF_IST(),
+ EF_UServiceTable('6f07', 0x07, 'EF.IST', 'ISIM Service Table', {1,None}, EF_IST_map),
EF_PCSCF(),
EF_GBABP(),
EF_GBANL(),