Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Bug 1112577 - Ensure that all call log database operations are atomic…
Browse files Browse the repository at this point in the history 
… r=thills
  • Loading branch information
@gabrielesvelto @rvandermeulen
gabrielesvelto authored and rvandermeulen committed Feb 19, 2015
1 parent 49d01ea commit 8154abc
Show file tree
Hide file tree
Showing 5 changed files with 374 additions and 252 deletions.
147 changes: 84 additions & 63 deletions apps/communications/dialer/js/call_log.js
View file
Expand Up @@ -10,7 +10,7 @@ var CallLog = {
_headersInterval: null,
_empty: true,
_dbupgrading: false,
_contactCache: true,
_contactCache: false,

init: function cl_init() {
if (this._initialized) {
Expand All @@ -35,33 +35,7 @@ var CallLog = {
];
var self = this;

// Get the latest contact cache revision and the actual Contacts API
// db revision. If both values differ, we need to update the contact cache
// and its revision and directly query the Contacts API to render the
// appropriate information while the cache is being rebuilt.
window.asyncStorage.getItem('contactCacheRevision',
function onItem(cacheRevision) {
Contacts.getRevision(function(contactsRevision) {
// We don't need to sync if this is the first time that we use the call
// log.
if (!cacheRevision || cacheRevision > contactsRevision) {
window.asyncStorage.setItem('contactCacheRevision',
contactsRevision);
return;
}

self._contactCache = (cacheRevision >= contactsRevision);
if (self._contactCache) {
return;
}

CallLogDBManager.invalidateContactsCache(function(error) {
if (!error) {
self._contactCache = true;
}
});
});
});
var validContactsCachePromise = this._validateContactsCache();

LazyLoader.load(lazyFiles, function resourcesLoaded() {
var mainNodes = [
Expand Down Expand Up @@ -89,41 +63,43 @@ var CallLog = {
var dualSim = navigator.mozIccManager.iccIds.length > 1;
self.callLogContainer.classList.toggle('dual-sim', dualSim);

self.render();

window.addEventListener('timeformatchange',
self._updateCallTimes.bind(self));
self.callLogIconEdit.addEventListener('click',
self.showEditMode.bind(self));
self.editModeHeader.addEventListener('action',
self.hideEditMode.bind(self));
self.missedFilter.addEventListener('click',
self.filter.bind(self));
self.allFilter.addEventListener('click',
self.unfilter.bind(self));
self.callLogContainer.addEventListener('click', self);
self.callLogContainer.addEventListener('contextmenu', self);
self.selectAllThreads.addEventListener('click',
self.selectAll.bind(self));
self.deselectAllThreads.addEventListener('click',
self.deselectAll.bind(self));
self.deleteButton.addEventListener('click',
self.deleteLogGroups.bind(self));
document.addEventListener('visibilitychange', function() {
if (document.hidden) {
self.pauseHeaders();
} else {
self.updateHeadersContinuously();
if (window.location.hash === '#call-log-view') {
self.becameVisible();
validContactsCachePromise.then(function() {
self.render();

window.addEventListener('timeformatchange',
self._updateCallTimes.bind(self));
self.callLogIconEdit.addEventListener('click',
self.showEditMode.bind(self));
self.editModeHeader.addEventListener('action',
self.hideEditMode.bind(self));
self.missedFilter.addEventListener('click',
self.filter.bind(self));
self.allFilter.addEventListener('click',
self.unfilter.bind(self));
self.callLogContainer.addEventListener('click', self);
self.callLogContainer.addEventListener('contextmenu', self);
self.selectAllThreads.addEventListener('click',
self.selectAll.bind(self));
self.deselectAllThreads.addEventListener('click',
self.deselectAll.bind(self));
self.deleteButton.addEventListener('click',
self.deleteLogGroups.bind(self));
document.addEventListener('visibilitychange', function() {
if (document.hidden) {
self.pauseHeaders();
} else {
self.updateHeadersContinuously();
if (window.location.hash === '#call-log-view') {
self.becameVisible();
}
}
}
});
});

self.sticky = new StickyHeader(self.callLogContainer,
document.getElementById('sticky'));
self.sticky = new StickyHeader(self.callLogContainer,
document.getElementById('sticky'));

self.becameVisible();
self.becameVisible();
});
});

// Listen for database upgrade events.
Expand All @@ -145,6 +121,50 @@ var CallLog = {
};
},

/**
* Returns a promise that is fullfilled once the contact cache has been
* validated. Note that the contents of the contact cache may still be stale
* after the promise is fullfilled. This only guarantees that
* this._contactCache contains a valid value.
*
* @return {Promise} A promise that is fullfilled once we've validated the
* contact cache.
*/
_validateContactsCache: function cl_validateContactsCache() {
return new Promise(function(resolve, reject) {
/* Get the latest contact cache revision and the actual Contacts API
* db revision. If both values differ, we need to update the contact cache
* and its revision and directly query the Contacts API to render the
* appropriate information while the cache is being rebuilt. */
window.asyncStorage.getItem('contactCacheRevision',
function onItem(cacheRevision) {
Contacts.getRevision(function(contactsRevision) {
/* We don't need to sync if this is the first time that we use the
* call log. */
if (!cacheRevision || cacheRevision > contactsRevision) {
window.asyncStorage.setItem('contactCacheRevision',
contactsRevision);
resolve();
return;
}

self._contactCache = (cacheRevision >= contactsRevision);
if (self._contactCache) {
resolve();
return;
}

CallLogDBManager.invalidateContactsCache(function(error) {
if (!error) {
self._contactCache = true;
resolve();
}
});
});
});
});
},

_updateCallTimes: function cl_updateCallTimes() {
var logItemElts = this.callLogContainer.querySelectorAll('.log-item');
for (var i = 0; i < logItemElts.length; i++) {
Expand Down Expand Up @@ -889,18 +909,19 @@ var CallLog = {
},

_removeContact: function _removeContact(log, contactId, updateDb) {
var self = this;
// If the cache is valid, we also need to remove the contact from the
// cache
if (self._contactCache && updateDb) {
if (this._contactCache && updateDb) {
var self = this;

CallLogDBManager.removeGroupContactInfo(contactId, null,
function(result) {
if (typeof result === 'number' && result > 0) {
self.updateContactInfo(log);
}
});
} else {
self.updateContactInfo(log);
this.updateContactInfo(log);
}
},

Expand Down

0 comments on commit 8154abc

Please sign in to comment.