mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Additional error handling/logging during contact sync (#1395)

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-08-30 09:35:04 -07:00 committed by GitHub
parent e16d80d9a2
commit b14667ae40
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
js/background.js
View file

@ -193,16 +193,24 @@
return;
}
return ConversationController.findOrCreateById(id, 'private').then(function(conversation) {
return new Promise(function(resolve, reject) {
conversation.save({
name: details.name,
avatar: details.avatar,
color: details.color,
active_at: conversation.get('active_at') || Date.now(),
}).then(resolve, reject);
return ConversationController.findOrCreateById(id, 'private')
.then(function(conversation) {
return new Promise(function(resolve, reject) {
conversation.save({
name: details.name,
avatar: details.avatar,
color: details.color,
active_at: conversation.get('active_at') || Date.now(),
}).then(resolve, reject);
});
})
.then(ev.confirm)
.catch(function(error) {
console.log(
'onContactReceived error:',
error && error.stack ? error.stack : error
);
});
}).then(ev.confirm);
}
function onGroupReceived(ev) {

9
js/conversation_controller.js
View file

@ -104,7 +104,14 @@
conversation.fetch().then(function() {
resolve(conversation);
}, function() {
conversation.save().then(function() {
var deferred = conversation.save();
if (!deferred) {
console.log('Conversation save failed! ', id, type);
return reject(new Error('findOrCreateById: Conversation save failed'));
}
deferred.then(function() {
resolve(conversation);
}, reject);
});