From 705dc819661cb8c8e839a04577b0641bd6caad53 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 21 Mar 2013 14:22:33 -0700
Subject: Revert "New loading model"

Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
---
 src/com/android/photos/shims/MediaItemsLoader.java | 3 ++-
 src/com/android/photos/shims/MediaSetLoader.java   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/com/android/photos')

diff --git a/src/com/android/photos/shims/MediaItemsLoader.java b/src/com/android/photos/shims/MediaItemsLoader.java
index d75823404..6142355a9 100644
--- a/src/com/android/photos/shims/MediaItemsLoader.java
+++ b/src/com/android/photos/shims/MediaItemsLoader.java
@@ -106,7 +106,8 @@ public class MediaItemsLoader extends AsyncTaskLoader<Cursor> implements LoaderC
 
     @Override
     public Cursor loadInBackground() {
-        mMediaSet.loadIfDirty();
+        // TODO: This probably doesn't work
+        mMediaSet.reload();
         final MatrixCursor cursor = new MatrixCursor(PhotoSetLoader.PROJECTION);
         final Object[] row = new Object[PhotoSetLoader.PROJECTION.length];
         final SparseArray<MediaItem> mediaItems = new SparseArray<MediaItem>();
diff --git a/src/com/android/photos/shims/MediaSetLoader.java b/src/com/android/photos/shims/MediaSetLoader.java
index d200807f9..9093bc139 100644
--- a/src/com/android/photos/shims/MediaSetLoader.java
+++ b/src/com/android/photos/shims/MediaSetLoader.java
@@ -104,14 +104,15 @@ public class MediaSetLoader extends AsyncTaskLoader<Cursor> implements LoaderCom
 
     @Override
     public Cursor loadInBackground() {
-        mMediaSet.loadIfDirty();
+        // TODO: This probably doesn't work
+        mMediaSet.reload();
         final MatrixCursor cursor = new MatrixCursor(AlbumSetLoader.PROJECTION);
         final Object[] row = new Object[AlbumSetLoader.PROJECTION.length];
         int count = mMediaSet.getSubMediaSetCount();
         ArrayList<MediaItem> coverItems = new ArrayList<MediaItem>(count);
         for (int i = 0; i < count; i++) {
             MediaSet m = mMediaSet.getSubMediaSet(i);
-            m.loadIfDirty();
+            m.reload();
             row[AlbumSetLoader.INDEX_ID] = i;
             row[AlbumSetLoader.INDEX_TITLE] = m.getName();
             row[AlbumSetLoader.INDEX_COUNT] = m.getMediaItemCount();
-- 
cgit v1.2.3