lexicoder
diff --git a/‎NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/Constants.java‎
100644100755
Lines changed: 1 addition & 1 deletion b/‎NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/Constants.java‎
100644100755
Lines changed: 1 addition & 1 deletion
diff --git a/‎NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/NfcTransHandlerApp.java‎
Lines changed: 21 additions & 0 deletions b/‎NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/NfcTransHandlerApp.java‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/commands/Iso7816Command.java‎
100644100755 b/‎NFC/NfcTransactionHandler/src/nfc/sample/nfctransaction/commands/Iso7816Command.java‎
100644100755
@@ -17,7 +17,7 @@
 import net.rim.device.api.ui.Color;
 
 public class Constants {
-    public static String VERSION = "1.1.5";
+    public static String VERSION = "1.2.1";
 
     public static final int SE_SIM=0;
     public static final int SE_EMB=1;
 
@@ -27,6 +27,7 @@
 import net.rim.device.api.system.ApplicationManager;
 import net.rim.device.api.system.ApplicationManagerException;
 import net.rim.device.api.system.Backlight;
+import net.rim.device.api.system.GPRSInfo;
 import net.rim.device.api.system.RuntimeStore;
 import net.rim.device.api.ui.UiApplication;
 import net.rim.device.api.util.ByteArrayUtilities;
@@ -67,6 +68,9 @@ public static void main(String[] args) {
 
                 Backlight.enable(true, 10);
 
+                // Essential that the SIM is unlocked (PIN) and initialised before we can proceed to use JSR177
+                waitForSimInitialisation();
+
                 CardEmulation.registerTransactionListener(app);
 
                 Utilities.log("XXXX " + pid + ":" + Thread.currentThread().getName() + " TransactionListener is exiting and will be restarted when a transaction occurs");
@@ -91,6 +95,23 @@ public static void main(String[] args) {
         }
     }
 
+    private static void waitForSimInitialisation() {
+        
+        int mcc = GPRSInfo.getHomeMCC();
+        int mnc = GPRSInfo.getHomeMNC();
+        Utilities.log("XXXX MCC="+mcc+",MNC="+mnc);
+        while (mcc == -1) {
+            try {
+                Thread.sleep(3000);
+            } catch(InterruptedException e) {
+            }
+            mcc = GPRSInfo.getHomeMCC();
+            mnc = GPRSInfo.getHomeMNC();
+            Utilities.log("XXXX MCC="+mcc+",MNC="+mnc);
+        }
+        Utilities.log("XXXX SIM initialised.... proceeding");
+    }
+
     private static void dumpArgs(String[] args) {
         for(int i = 0; i < args.length; i++) {
             Utilities.log("XXXX " + pid + ":" + Thread.currentThread().getName() + " args[" + i + "]=" + args[i]);