From 066811d51fa2d7bd2d900b77494f8d5437971697 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Sat, 19 Sep 2015 18:10:29 -0400
Subject: make sure we don't check touchID for android

---
 www/js/PortalLoginCtrl.js          | 43 ++++++++++++++++++++++----------------
 www/templates/zm-portal-login.html |  2 +-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 97ff214b..853a9593 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -28,23 +28,30 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     if (ZMDataModel.isLoggedIn()) {
         ZMDataModel.zmLog("User credentials are provided");
         
-        // You can login either via touch ID or typing in your code
-        $cordovaTouchID.checkSupport()
-            .then(function () {
-        // success, TouchID supported
-            $cordovaTouchID.authenticate("")
-                .then(function() {
-                    ZMDataModel.zmLog("Touch Success");
-                    $scope.pindata.pin = loginData.pinCode;
-                    unlock();
+        // You can login either via touch ID or typing in your code     
+        if ( $ionicPlatform.is('ios'))
+        {
+            $cordovaTouchID.checkSupport()
+                .then(function () {
+            // success, TouchID supported
+                $cordovaTouchID.authenticate("")
+                    .then(function() {
+                        ZMDataModel.zmLog("Touch Success");
+                        // Don't assign pin as it may be alphanum
+                        unlock(true);
 
-                }, 
-                function () {
-                    ZMDataModel.zmLog("Touch Failed");
+                    }, 
+                    function () {
+                        ZMDataModel.zmLog("Touch Failed");
+                });
+            }, function (error) {
+                ZMDataModel.zmLog("TouchID not supported");
             });
-        }, function (error) {
-            ZMDataModel.zmLog("TouchID not supported");
-        });
+        }
+        else
+        {
+            ZMDataModel.zmLog("Not iOS, not checking for touchID");
+        }
         
         if (loginData.usePin ) {
             $scope.pinPrompt = true;
@@ -105,13 +112,13 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     // unlock app if PIN is correct
     //-------------------------------------------------------------------------------
     $scope.unlock = function () {
-        unlock();
+        unlock(false);
     };
     
-    function unlock()
+    function unlock(touchVerified)
     {
                 ZMDataModel.zmDebug("Trying to unlock PIN");
-        if ($scope.pindata.pin == loginData.pinCode) {
+        if (touchVerified || ($scope.pindata.pin == loginData.pinCode) ) {
             ZMDataModel.zmDebug("PIN code entered is correct");
             $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
             zmAutoLogin.stop(); //safety
diff --git a/www/templates/zm-portal-login.html b/www/templates/zm-portal-login.html
index d70a36c8..b372823f 100644
--- a/www/templates/zm-portal-login.html
+++ b/www/templates/zm-portal-login.html
@@ -15,7 +15,7 @@
                     </div>
                     <br/> <span style="color:white">{{pindata.status}}</span>
                     <br/>
-                    <button class="button button-block button-dark icon ion-unlocked" ng-click="unlock()"> Unlock
+                    <button class="button  button-dark icon ion-unlocked" ng-click="unlock()"> Unlock
                     </button>
                 </div>
             </center>
-- 
cgit v1.2.3