Merge pull request #3507 from jaoo/bug774114

Make the unlock SIM dialog work after changing -bug774114- a bit the pla...

apps/system/js/pinlock/pinlock.js

@@ -51,21 +51,18 @@ var PinLock = {
     }
     var unlock = this.conn.unlockCardLock({lockType: 'pin', pin: this.pinCode});
     var pinLock = this;
+    /* whatever happens, we need to reset the status:
+       we got a reponse from the SIM card, so either current
+       PIN code is good and we will clear and exit, or it
+       is not and there is no point in keeping it */
     unlock.onsuccess = function() {
-      var res = unlock.result;
-      /* whatever happens, we need to reset the status:
-         we got a reponse from the SIM card, so either current
-         PIN code is good and we will clear and exit, or it
-         is not and there is no point in keeping it */
       pinLock.reset();
-      console.log('Unlocking SIM: ' + res.result);
-      if (res.result == true) {
-        pinLock.hideKeypad();
-      } else {
-        console.log('Bad PIN code! Number of retries: ' + res.retryCount);
-        this.notifyRetryCount(res.retryCount);
-      }
-    }
+      pinLock.hideKeypad();
+    };
+    unlock.onerror = function() {
+      pinLock.reset();
+      this.notifyRetryCount(unlock.result.retryCount);
+    };
     this.reset();
   },