From a90503ac175216ed6836c4d94e03e3da08cccf33 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 11 Jan 2016 11:43:34 -0300
Subject: [PATCH] Adds new plugin for Android. Fix cancel

---
 cordova/build.sh               | 21 ++++++++++++---------
 src/js/directives/qrScanner.js | 20 +++++++++-----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cordova/build.sh b/cordova/build.sh
index 0bcbe3bc9..b2f7f9a01 100755
--- a/cordova/build.sh
+++ b/cordova/build.sh
@@ -84,7 +84,7 @@ if [ ! -d $PROJECT ]; then
   cordova plugin add https://github.com/florentvaldelievre/virtualartifacts-webIntent.git
   checkOK
 
-  if [ $CURRENT_OS == "IOS" ]
+  if [ $CURRENT_OS != "WP8" ]
   then
     cordova plugin add https://github.com/tjwoon/csZBar.git
     checkOK
@@ -135,17 +135,20 @@ if [ ! -d $PROJECT ]; then
   cordova plugin add cordova-plugin-file@3.0.0
   checkOK
 
-  cordova plugin add cordova-plugin-touch-id && cordova prepare
-  checkOK
+  if [ $CURRENT_OS == "IOS" ]
+  then
+    cordova plugin add cordova-plugin-touch-id && cordova prepare
+    checkOK
 
-  cordova plugin add cordova-plugin-transport-security
-  checkOK
+    cordova plugin add cordova-plugin-transport-security
+    checkOK
 
-  cordova plugin add cordova-ios-requires-fullscreen
-  checkOK
+    cordova plugin add cordova-ios-requires-fullscreen
+    checkOK
 
-  cordova plugin add cordova-plugin-disable-bitcode
-  checkOK
+    cordova plugin add cordova-plugin-disable-bitcode
+    checkOK
+  fi
 
 fi
 
diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js
index b711102f1..e62bfd8bd 100644
--- a/src/js/directives/qrScanner.js
+++ b/src/js/directives/qrScanner.js
@@ -11,29 +11,27 @@ angular.module('copayApp.directives')
               window.plugins.spinnerDialog.hide();
               window.ignoreMobilePause = false;
             }, 100);
-            if (!isMobile.iOS() && result.cancelled) return;
+            if (isMobile.Windows() && result.cancelled) return;
 
             $timeout(function() {
-              var data = isMobile.iOS() ? result : result.text;
+              var data = isMobile.Windows() ? result.text : result;
               $scope.onScan({ data: data });
             }, 1000);
           };
 
-          var onError = function() {
-            function onError(error) {
-              $timeout(function() {
-                window.ignoreMobilePause = false;
-                window.plugins.spinnerDialog.hide();
-              }, 100);
-            }
+          var onError = function(error) {
+            $timeout(function() {
+              window.ignoreMobilePause = false;
+              window.plugins.spinnerDialog.hide();
+            }, 100);
           };
 
           $scope.cordovaOpenScanner = function() {
             window.ignoreMobilePause = true;
             window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Preparing camera...'), true);
             $timeout(function() {
-              if (isMobile.iOS()) {
-                cloudSky.zBar.scan({}, onSuccess, onError)
+              if (!isMobile.Windows()) {
+                cloudSky.zBar.scan({}, onSuccess, onError);
               } else {
                 cordova.plugins.barcodeScanner.scan(onSuccess, onError);
               }