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

handle network reconnection

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-13 14:58:07 -03:00
commit 9efa2dfe24
16 changed files with 125 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/css/mobile.css
View file

@ -476,8 +476,10 @@ a.pin-button:active {
.dr-notification-wrapper.offline {
position: absolute;
top: 45px;
z-index: 11;
top: 0px;
z-index: 2000;
opacity: 1.0 !important;
background-color: #2C3E50;
}
.dr-notification-wrapper.client-error {

35
src/js/controllers/index.js
View file

@ -69,8 +69,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var get = function(cb) {
if (walletStatus)
return cb(null, walletStatus);
else
return fc.getStatus(cb);
else {
self.updateError = false;
return fc.getStatus(function(err, ret) {
if (err) self.updateError = true;
return cb(err, ret);
});
}
};
var fc = profileService.focusedClient;
@ -144,6 +149,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$timeout(function() {
self.setOngoingProcess('updatingTxHistory', true);
$log.debug('Updating Transaction History');
self.txHistoryError = false;
fc.getTxHistory({
skip: self.skipHistory,
limit: self.limitHistory + 1
@ -152,8 +158,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (err) {
$log.debug('TxHistory ERROR:', err);
$scope.$emit('Local/ClientError', err);
}
else {
self.txHistoryError = true;
} else {
$log.debug('Wallet Transaction History:', txs);
self.skipHistory = self.skipHistory + self.limitHistory;
self.setTxHistory(txs);
@ -390,14 +396,19 @@ angular.module('copayApp.controllers').controller('indexController', function($r
go.walletHome();
});
$rootScope.$on('Local/OnLine', function(event) {
self.isOffLine = false;
self.updateAll();
self.updateTxHistory();
lodash.each(['Local/Online', 'Local/Resume'], function(eventName) {
$rootScope.$on(eventName, function(event) {
$log.debug('### Online event');
self.isOffline = false;
self.updateAll();
self.updateTxHistory();
});
});
$rootScope.$on('Local/OffLine', function(event) {
self.isOffLine = true;
$rootScope.$on('Local/Offline', function(event) {
$log.debug('========== Offline event');
self.isOffline = true;
$rootScope.$apply();
});
$rootScope.$on('Local/BackupDone', function(event) {
@ -424,6 +435,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (err.code && err.code === 'NOTAUTHORIZED') {
// Show not error, just redirect to home (where the recreate option is shown)
go.walletHome();
} else if (err && err.cors == 'rejected') {
$log.debug('CORS error:', err);
} else {
self.clientError = err;
}
@ -506,7 +519,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) {
self.askPassword = {
isSetup: isSetup,
callback: function (err, pass) {
callback: function(err, pass) {
self.askPassword = null;
return cb(err, pass);
},

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

@ -16,15 +16,17 @@ angular.module('copayApp.controllers').controller('receiveController',
this.newAddress = function() {
self.generatingAddress = true;
self.error = null;
fc.createAddress(function(err, addr) {
self.generatingAddress = false;
if (err) {
$log.debug('Creating address ERROR:', err);
$scope.$emit('Local/ClientError', err);
self.error='Could not generate address';
} else {
self.addr = addr.address;
storageService.storeLastAddress(fc.credentials.walletId, addr.address, function() {});
}
self.generatingAddress = false;
$scope.$digest();
});
};

19
src/js/init.js
View file

@ -23,13 +23,24 @@ angular.element(document).ready(function() {
window.location = '#/';
}
}, false);
document.addEventListener('resume', function() {
window.location = '#/cordova/resume';
setTimeout(function() {
window.ignoreMobilePause = false;
}, 100);
}, false);
// We are not emitting here, since when the BWS socket reconnects,
// update will be triggered
// document.addEventListener('offline', function() {
// window.location = '#/cordova/offline';
// }, false);
//
// document.addEventListener("online", function() {
// window.location = '#/cordoba/online';
// }, false);
document.addEventListener('backbutton', function() {
window.location = '#/walletHome';
}, false);
@ -38,13 +49,7 @@ angular.element(document).ready(function() {
window.location = '#/preferences';
}, false);
document.addEventListener('offline', function() {
window.location = '#/network/offline';
}, false);
document.addEventListener("online", function() {
window.location = '#/network/online';
}, false);
setTimeout(function() {
navigator.splashscreen.hide();

50
src/js/routes.js
View file

@ -322,8 +322,8 @@ angular
}
}
})
.state('preferencesAltCurrency', {
.state('preferencesAltCurrency', {
url: '/preferencesAltCurrency',
templateUrl: 'views/preferencesAltCurrency.html',
walletShouldBeComplete: true,
@ -409,33 +409,36 @@ angular
})
.state('add', {
url: '/add',
needProfile: true,
views: {
'main': {
templateUrl: 'views/add.html'
},
'topbar': {
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.titleSection = 'Add wallet';
$scope.goBackToState = 'walletHome';
url: '/add',
needProfile: true,
views: {
'main': {
templateUrl: 'views/add.html'
},
'topbar': {
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.titleSection = 'Add wallet';
$scope.goBackToState = 'walletHome';
}
}
}
}
})
.state('network', {
url: '/network/:status',
})
.state('cordova', {
url: '/cordova/:status',
views: {
'main': {
controller: function($scope, $stateParams, go) {
switch ($stateParams.status) {
case 'online':
$scope.$emit('Local/OnLine');
break;
case 'offline':
$scope.$emit('Local/OffLine');
case 'resume':
$scope.$emit('Local/Resume');
break;
// case 'online':
// // $scope.$emit('Local/Online');
// break;
// case 'offline':
// // $scope.$emit('Local/Offline');
// break;
};
go.walletHome();
}
@ -491,8 +494,7 @@ angular
if (pageWeight[fromState.name] > pageWeight[toState.name]) {
$rootScope.$emit('Animation/SwipeRight');
}
else if (pageWeight[fromState.name] < pageWeight[toState.name]) {
} else if (pageWeight[fromState.name] < pageWeight[toState.name]) {
$rootScope.$emit('Animation/SwipeLeft');
}

1
src/js/services/configService.js
View file

@ -13,6 +13,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
// Bitcore wallet service URL
bws: {
url: 'http://162.242.245.33:3004/bws/api',
// url: 'http://localhost:3001/bws/api',
},
// insight

14
src/js/services/profileService.js
View file

@ -60,6 +60,20 @@ angular.module('copayApp.services')
root.walletClients[credentials.walletId] = client;
client.removeAllListeners();
client.on('reconnect', function() {
if (root.focusedClient.credentials.walletId == client.credentials.walletId) {
$rootScope.$emit('Local/Online');
}
});
client.on('reconnecting', function() {
if (root.focusedClient.credentials.walletId == client.credentials.walletId) {
$rootScope.$emit('Local/Offline');
}
});
client.on('notification', function(n) {
$log.debug('BWC Notification:', n);
notificationService.newBWCNotification(n,