Separating methods for updating the model to a sepatate class.

Removing static access to model update methods, to allow for better
access control and testing

Change-Id: I9afe004dbf1b2fe50df422fd28bceea9230a4704
This commit is contained in:
Sunny Goyal
2017-02-02 13:52:53 -08:00
parent 5a2edd65f2
commit 43bf11d9c9
17 changed files with 450 additions and 372 deletions

View File

@@ -270,7 +270,7 @@ public class PackageUpdatedTask extends ExtendedModelTask {
updatedShortcuts.add(si);
}
if (infoUpdated) {
LauncherModel.updateItemInDatabase(context, si);
getModelWriter().updateItemInDatabase(si);
}
} else if (info instanceof LauncherAppWidgetInfo && mOp == OP_ADD) {
LauncherAppWidgetInfo widgetInfo = (LauncherAppWidgetInfo) info;
@@ -287,7 +287,7 @@ public class PackageUpdatedTask extends ExtendedModelTask {
widgetInfo.restoreStatus |= LauncherAppWidgetInfo.FLAG_UI_NOT_READY;
widgets.add(widgetInfo);
LauncherModel.updateItemInDatabase(context, widgetInfo);
getModelWriter().updateItemInDatabase(widgetInfo);
}
}
}
@@ -295,7 +295,7 @@ public class PackageUpdatedTask extends ExtendedModelTask {
bindUpdatedShortcuts(updatedShortcuts, removedShortcuts, mUser);
if (!removedShortcuts.isEmpty()) {
LauncherModel.deleteItemsFromDatabase(context, removedShortcuts);
getModelWriter().deleteItemsFromDatabase(removedShortcuts);
}
if (!widgets.isEmpty()) {
@@ -332,10 +332,10 @@ public class PackageUpdatedTask extends ExtendedModelTask {
}
if (!removedPackages.isEmpty() || !removedComponents.isEmpty()) {
LauncherModel.deleteItemsFromDatabase(
context, ItemInfoMatcher.ofPackages(removedPackages, mUser));
LauncherModel.deleteItemsFromDatabase(
context, ItemInfoMatcher.ofComponents(removedComponents, mUser));
getModelWriter().deleteItemsFromDatabase(
ItemInfoMatcher.ofPackages(removedPackages, mUser));
getModelWriter().deleteItemsFromDatabase(
ItemInfoMatcher.ofComponents(removedComponents, mUser));
// Remove any queued items from the install queue
InstallShortcutReceiver.removeFromInstallQueue(context, removedPackages, mUser);