mirror of https://github.com/BTCPrivate/copay.git
fix fingerprint setting, remove activity from home
This commit is contained in:
parent
21c5cd3fd7
commit
333b4f45a0
|
@ -42,4 +42,4 @@ wp: build-wp
|
||||||
|
|
||||||
androidrun:
|
androidrun:
|
||||||
make -C $(WORKDIR)android run
|
make -C $(WORKDIR)android run
|
||||||
adb logcat | grep copay.js
|
adb logcat | grep chromium
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"manifest_version": 2,
|
"manifest_version": 2,
|
||||||
"name": "BitPay",
|
"name": "BitPay",
|
||||||
"description": "The BitPay Bitcoin Wallet",
|
"description": "The BitPay Bitcoin Wallet",
|
||||||
"version": "0.7.0",
|
"version": "0.8.0",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"storage",
|
"storage",
|
||||||
"unlimitedStorage",
|
"unlimitedStorage",
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"name": "bitpay",
|
"name": "bitpay",
|
||||||
"description": "The BitPay Bitcoin Wallet",
|
"description": "The BitPay Bitcoin Wallet",
|
||||||
"author": "BitPay",
|
"author": "BitPay",
|
||||||
"version": "0.7.0",
|
"version": "0.8.0",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"wallet",
|
"wallet",
|
||||||
"copay",
|
"copay",
|
||||||
|
|
|
@ -69,10 +69,12 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
||||||
|
|
||||||
$scope.touchIdChange = function() {
|
$scope.touchIdChange = function() {
|
||||||
var newStatus = $scope.touchIdEnabled;
|
var newStatus = $scope.touchIdEnabled;
|
||||||
walletService.setTouchId(wallet, newStatus, function(err) {
|
walletService.setTouchId(wallet, !!newStatus, function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
$log.warn(err);
|
|
||||||
$scope.touchIdEnabled = !newStatus;
|
$scope.touchIdEnabled = !newStatus;
|
||||||
|
$timeout(function() {
|
||||||
|
$scope.$apply();
|
||||||
|
}, 1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$log.debug('Touch Id status changed: ' + newStatus);
|
$log.debug('Touch Id status changed: ' + newStatus);
|
||||||
|
|
|
@ -31,19 +31,19 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
wallet.status = status;
|
wallet.status = status;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
//
|
||||||
$scope.fetchingNotifications = true;
|
// $scope.fetchingNotifications = true;
|
||||||
profileService.getNotifications({
|
// profileService.getNotifications({
|
||||||
limit: 3
|
// limit: 3
|
||||||
}, function(err, n) {
|
// }, function(err, n) {
|
||||||
if (err) {
|
// if (err) {
|
||||||
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
|
// console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
$scope.fetchingNotifications = false;
|
// $scope.fetchingNotifications = false;
|
||||||
setNotifications(n);
|
// setNotifications(n);
|
||||||
$ionicScrollDelegate.resize();
|
// $ionicScrollDelegate.resize();
|
||||||
})
|
// })
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.updateWallet = function(wallet) {
|
$scope.updateWallet = function(wallet) {
|
||||||
|
@ -55,17 +55,17 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
||||||
}
|
}
|
||||||
wallet.status = status;
|
wallet.status = status;
|
||||||
|
|
||||||
profileService.getNotifications({
|
// profileService.getNotifications({
|
||||||
limit: 3
|
// limit: 3
|
||||||
}, function(err, n) {
|
// }, function(err, n) {
|
||||||
console.log('[tab-home.js.57]', n); //TODO
|
// console.log('[tab-home.js.57]', n); //TODO
|
||||||
if (err) {
|
// if (err) {
|
||||||
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
|
// console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
setNotifications(n);
|
// setNotifications(n);
|
||||||
$ionicScrollDelegate.resize();
|
// $ionicScrollDelegate.resize();
|
||||||
})
|
// })
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -827,6 +827,7 @@ angular.module('copayApp.services')
|
||||||
prev;
|
prev;
|
||||||
|
|
||||||
|
|
||||||
|
// REMOVE (if we want 1-to-1 notification) ????
|
||||||
lodash.each(shown, function(x) {
|
lodash.each(shown, function(x) {
|
||||||
if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
|
if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
|
||||||
prev.types.push(x.type);
|
prev.types.push(x.type);
|
||||||
|
|
|
@ -995,10 +995,17 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
|
||||||
};
|
};
|
||||||
|
|
||||||
root.setTouchId = function(wallet, enabled, cb) {
|
root.setTouchId = function(wallet, enabled, cb) {
|
||||||
|
|
||||||
|
var opts = {
|
||||||
|
touchIdFor: {}
|
||||||
|
};
|
||||||
|
opts.touchIdFor[wallet.id] = enabled;
|
||||||
|
|
||||||
fingerprintService.check(wallet, function(err) {
|
fingerprintService.check(wallet, function(err) {
|
||||||
if (err) return cb(err); {
|
if (err) {
|
||||||
$log.debug(err);
|
opts.touchIdFor[wallet.id] = !enabled;
|
||||||
return;
|
$log.debug('Error with fingerprint:' + err);
|
||||||
|
return cb(err);
|
||||||
}
|
}
|
||||||
configService.set(opts, cb);
|
configService.set(opts, cb);
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Version=0.7.0
|
Version=0.8.0
|
||||||
Name=BitPay
|
Name=BitPay
|
||||||
Comment=The BitPay Bitcoin Wallet
|
Comment=The BitPay Bitcoin Wallet
|
||||||
Exec=bitpay
|
Exec=bitpay
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||||
|
|
||||||
#define MyAppName "bitpay"
|
#define MyAppName "bitpay"
|
||||||
#define MyAppVersion "0.7.0"
|
#define MyAppVersion "0.8.0"
|
||||||
#define MyAppPublisher "BitPay"
|
#define MyAppPublisher "BitPay"
|
||||||
#define MyAppURL "https://bitpay.com"
|
#define MyAppURL "https://bitpay.com"
|
||||||
#define MyAppExeName "*NAMECASENOSPACE.exe"
|
#define MyAppExeName "*NAMECASENOSPACE.exe"
|
||||||
|
|
Loading…
Reference in New Issue