1 files changed, 12 insertions, 15 deletions
diff --git a/src/com/android/gallery3d/data/ClusterAlbumSet.java b/src/com/android/gallery3d/data/ClusterAlbumSet.java
index a551de2ab..cb212ba36 100644
--- a/src/com/android/gallery3d/data/ClusterAlbumSet.java
+++ b/src/com/android/gallery3d/data/ClusterAlbumSet.java
@@ -24,7 +24,7 @@ import com.android.gallery3d.app.GalleryApp;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-public class ClusterAlbumSet extends MediaSetWrapper implements ContentListener {
+public class ClusterAlbumSet extends MediaSet implements ContentListener {
     @SuppressWarnings("unused")
     private static final String TAG = "ClusterAlbumSet";
     private GalleryApp mApplication;
@@ -35,7 +35,7 @@ public class ClusterAlbumSet extends MediaSetWrapper implements ContentListener
 
     public ClusterAlbumSet(Path path, GalleryApp application,
             MediaSet baseSet, int kind) {
-        super(baseSet, path, INVALID_DATA_VERSION);
+        super(path, INVALID_DATA_VERSION);
         mApplication = application;
         mBaseSet = baseSet;
         mKind = kind;
@@ -58,20 +58,17 @@ public class ClusterAlbumSet extends MediaSetWrapper implements ContentListener
     }
 
     @Override
-    protected boolean isDirtyLocked() {
-        return super.isDirtyLocked()
-                || !mFirstReloadDone;
-    }
-
-    @Override
-    public void load() throws InterruptedException {
-        super.load();
-        if (mFirstReloadDone) {
-            updateClustersContents();
-        } else {
-            updateClusters();
-            mFirstReloadDone = true;
+    public long reload() {
+        if (mBaseSet.reload() > mDataVersion) {
+            if (mFirstReloadDone) {
+                updateClustersContents();
+            } else {
+                updateClusters();
+                mFirstReloadDone = true;
+            }
+            mDataVersion = nextVersionNumber();
         }
+        return mDataVersion;
     }
 
     @Override