anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Update sound to play on the screens they suppose to play only

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-06-29 15:11:34 +02:00
commit f89499047a
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/confirm.js
View file

@ -624,7 +624,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
(processName == 'sendingTx' && !$scope.wallet.canSign() && !$scope.wallet.isPrivKeyExternal()) (processName == 'sendingTx' && !$scope.wallet.canSign() && !$scope.wallet.isPrivKeyExternal())
) && !isOn) { ) && !isOn) {
$scope.sendStatus = 'success'; $scope.sendStatus = 'success';
soundService.play('misc/payment_sent.mp3');
if ($state.current.name === "tabs.send.confirm") // XX SP: Otherwise all open wallets on other devices play this sound if you have been in a send flow before on that device.
soundService.play('misc/payment_sent.mp3');
firebaseEventsService.logEvent('sent_bitcoin', { coin: $scope.wallet.coin }); firebaseEventsService.logEvent('sent_bitcoin', { coin: $scope.wallet.coin });
$timeout(function() { $timeout(function() {
$scope.$digest(); $scope.$digest();

5
src/js/controllers/tab-receive.js
View file

@ -130,8 +130,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
} }
} }
$scope.paymentReceivedCoin = $scope.wallet.coin; $scope.paymentReceivedCoin = $scope.wallet.coin;
$scope.$apply(function () {
if ($state.current.name === "tabs.receive")
soundService.play('misc/payment_received.mp3'); soundService.play('misc/payment_received.mp3');
$scope.$apply(function () {
$scope.showingPaymentReceived = true; $scope.showingPaymentReceived = true;
}); });
} }

11
src/js/services/soundService.js
View file

@ -13,9 +13,14 @@ angular.module('copayApp.services').service('soundService', function($log, $time
configService.whenAvailable(function(config) { configService.whenAvailable(function(config) {
if (config.soundsEnabled) { if (config.soundsEnabled) {
if (platformInfo.isCordova) { if (platformInfo.isCordova) {
var p = window.location.pathname;
var device_path = p.substring(0, p.lastIndexOf('/')); if (platformInfo.isAndroid) {
var audio = new Media(device_path + '/' + soundFile, var p = window.location.pathname;
var device_path = p.substring(0, p.lastIndexOf('/'));
soundFile = device_path + '/' + soundFile;
}
var audio = new Media(soundFile,
function () { function () {
$log.debug("playAudio(bch_sent):Audio Success"); $log.debug("playAudio(bch_sent):Audio Success");
}, },