Move parsing of PLMNwAcT to generic Card class

Change-Id: I14d7c2dc51fac6d5cf4a708a77ad23d252ba6094

2 files changed, 9 insertions, 2 deletions

diff --git a/pySim-read.py b/pySim-read.py
index d62cdd3..5229dda 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -163,9 +163,9 @@ if __name__ == '__main__':
 
 	# EF.PLMNwAcT
 	try:
-		(res, sw) = scc.read_binary(EF['PLMNwAcT'])
+		(res, sw) = card.read_plmn_act()
 		if sw == '9000':
-			print("PLMNwAcT:\n%s" % (format_xplmn_w_act(res)))
+			print("PLMNwAcT:\n%s" % (res))
 		else:
 			print("PLMNwAcT: Can't read, response code = %s" % (sw,))
 	except Exception as e:
diff --git a/pySim/cards.py b/pySim/cards.py
index d3b6262..16f6881 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -96,6 +96,13 @@ class Card(object):
 		data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content + 'ffffff0000' * (size // 5 - 1))
 		return sw
 
+	def read_plmn_act(self):
+		(res, sw) = self._scc.read_binary(EF['PLMNwAcT'])
+		if sw == '9000':
+			return (format_xplmn_w_act(res), sw)
+		else:
+			return (None, sw)
+
 	def update_plmn_act(self, mcc, mnc, access_tech='FFFF'):
 		"""
 		See note in update_hplmn_act()