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

Fix camera permissions for Android 6 (#4102)

This commit is contained in:
Gustavo Maximiliano Cortez 2016-04-21 14:13:25 -03:00 committed by Matias Alejo Garcia
parent 4761b68fcd
commit fea6bb7938
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cordova/build.sh
View File

@ -84,13 +84,12 @@ if [ ! -d $PROJECT ]; then
cordova plugin add https://github.com/florentvaldelievre/virtualartifacts-webIntent.git
checkOK
if [ $CURRENT_OS != "WP8" ]
if [ $CURRENT_OS == "IOS" ]
then
cordova plugin add https://github.com/tjwoon/csZBar.git
checkOK
else
echo "${OpenColor}${Green}* Using plugin phonegap-plugin-barcodescanner for Windows Phone 8 ${CloseColor}"
cordova plugin add https://github.com/phonegap/phonegap-plugin-barcodescanner.git
cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
checkOK
fi

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

@ -30,7 +30,7 @@ angular.module('copayApp.directives')
window.ignoreMobilePause = true;
window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Preparing camera...'), true);
$timeout(function() {
if (!isMobile.Windows()) {
if (isMobile.iOS()) {
cloudSky.zBar.scan({}, onSuccess, onError);
} else {
cordova.plugins.barcodeScanner.scan(onSuccess, onError);