mirror of https://github.com/BTCPrivate/copay.git
Fix camera permissions for Android 6 (#4102)
This commit is contained in:
parent
4761b68fcd
commit
fea6bb7938
|
@ -84,13 +84,12 @@ if [ ! -d $PROJECT ]; then
|
||||||
cordova plugin add https://github.com/florentvaldelievre/virtualartifacts-webIntent.git
|
cordova plugin add https://github.com/florentvaldelievre/virtualartifacts-webIntent.git
|
||||||
checkOK
|
checkOK
|
||||||
|
|
||||||
if [ $CURRENT_OS != "WP8" ]
|
if [ $CURRENT_OS == "IOS" ]
|
||||||
then
|
then
|
||||||
cordova plugin add https://github.com/tjwoon/csZBar.git
|
cordova plugin add https://github.com/tjwoon/csZBar.git
|
||||||
checkOK
|
checkOK
|
||||||
else
|
else
|
||||||
echo "${OpenColor}${Green}* Using plugin phonegap-plugin-barcodescanner for Windows Phone 8 ${CloseColor}"
|
cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
|
||||||
cordova plugin add https://github.com/phonegap/phonegap-plugin-barcodescanner.git
|
|
||||||
checkOK
|
checkOK
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ angular.module('copayApp.directives')
|
||||||
window.ignoreMobilePause = true;
|
window.ignoreMobilePause = true;
|
||||||
window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Preparing camera...'), true);
|
window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Preparing camera...'), true);
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
if (!isMobile.Windows()) {
|
if (isMobile.iOS()) {
|
||||||
cloudSky.zBar.scan({}, onSuccess, onError);
|
cloudSky.zBar.scan({}, onSuccess, onError);
|
||||||
} else {
|
} else {
|
||||||
cordova.plugins.barcodeScanner.scan(onSuccess, onError);
|
cordova.plugins.barcodeScanner.scan(onSuccess, onError);
|
||||||
|
|
Loading…
Reference in New Issue