BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adds new plugin for Android. Fix cancel

This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-11 11:43:34 -03:00
parent c5ae5d47c3
commit a90503ac17
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cordova/build.sh
View File

@ -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

20
src/js/directives/qrScanner.js
View File

@ -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);
}