Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 968170 - Change HomeConfigInvalidator to operate on pending changes (r=margaret)

Browse Source
This commit is contained in:
Lucas Rocha 2014-02-13 11:46:25 +00:00
parent 69af94d90e
commit 1b8aef511e
1 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mobile/android/base/home/HomeConfigInvalidator.java
View File

@ -42,10 +42,25 @@ public class HomeConfigInvalidator implements GeckoEventListener {
private static final String JSON_KEY_PANEL = "panel";
private enum ChangeType {
REMOVE,
INSTALL
}
private static class ConfigChange {
private final ChangeType type;
private final PanelConfig target;
public ConfigChange(ChangeType type, PanelConfig target) {
this.type = type;
this.target = target;
}
}
private Context mContext;
private HomeConfig mHomeConfig;
private final Queue<PanelConfig> mPendingChanges = new ConcurrentLinkedQueue<PanelConfig>();
private final Queue<ConfigChange> mPendingChanges = new ConcurrentLinkedQueue<ConfigChange>();
private final Runnable mInvalidationRunnable = new InvalidationRunnable();
public static HomeConfigInvalidator getInstance() {
@ -82,7 +97,7 @@ public class HomeConfigInvalidator implements GeckoEventListener {
* Runs in the gecko thread.
*/
private void handlePanelInstall(PanelConfig panelConfig) {
mPendingChanges.offer(panelConfig);
mPendingChanges.offer(new ConfigChange(ChangeType.INSTALL, panelConfig));
Log.d(LOGTAG, "handlePanelInstall: " + mPendingChanges.size());
scheduleInvalidation();
@ -92,8 +107,7 @@ public class HomeConfigInvalidator implements GeckoEventListener {
* Runs in the gecko thread.
*/
private void handlePanelRemove(PanelConfig panelConfig) {
panelConfig.setIsDeleted(true);
mPendingChanges.offer(panelConfig);
mPendingChanges.offer(new ConfigChange(ChangeType.REMOVE, panelConfig));
Log.d(LOGTAG, "handlePanelRemove: " + mPendingChanges.size());
scheduleInvalidation();
@ -116,22 +130,28 @@ public class HomeConfigInvalidator implements GeckoEventListener {
*/
private List<PanelConfig> executePendingChanges(List<PanelConfig> panelConfigs) {
while (!mPendingChanges.isEmpty()) {
final PanelConfig panelConfig = mPendingChanges.poll();
final ConfigChange pendingChange = mPendingChanges.poll();
final PanelConfig panelConfig = pendingChange.target;
final String id = panelConfig.getId();
if (panelConfig.isDeleted()) {
if (panelConfigs.remove(panelConfig)) {
Log.d(LOGTAG, "executePendingChanges: removed panel " + id);
}
} else {
final int index = panelConfigs.indexOf(panelConfig);
if (index >= 0) {
panelConfigs.set(index, panelConfig);
Log.d(LOGTAG, "executePendingChanges: replaced position " + index + " with " + id);
} else {
panelConfigs.add(panelConfig);
Log.d(LOGTAG, "executePendingChanges: added panel " + id);
}
switch (pendingChange.type) {
case REMOVE:
if (panelConfigs.remove(panelConfig)) {
Log.d(LOGTAG, "executePendingChanges: removed panel " + id);
}
break;
case INSTALL:
final int index = panelConfigs.indexOf(panelConfig);
if (index >= 0) {
panelConfigs.set(index, panelConfig);
Log.d(LOGTAG, "executePendingChanges: replaced position " + index + " with " + id);
} else {
panelConfigs.add(panelConfig);
Log.d(LOGTAG, "executePendingChanges: added panel " + id);
}
break;
}
}