diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-26 10:50:14 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 10:50:14 -0700 |
commit | ec131c48ff140bbfacbe3b3878365b7c23ffb00e (patch) | |
tree | e6e091297e9aac0ae9103fc16ddb518d591ed444 | |
parent | 0a7d60c34de8a1421c6db83bc84666c50245b3ac (diff) | |
parent | f54826e41455af5f59d6fb6ba804cfd57be992ff (diff) | |
download | Gallery3D-ec131c48ff140bbfacbe3b3878365b7c23ffb00e.tar.gz |
am f54826e4: Merge "Fixed the issue that the same album gets duplicated in Gallery3D" into gingerbread
* commit 'f54826e41455af5f59d6fb6ba804cfd57be992ff':
Fixed the issue that the same album gets duplicated in Gallery3D
-rw-r--r-- | src/com/cooliris/media/MediaFeed.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/cooliris/media/MediaFeed.java b/src/com/cooliris/media/MediaFeed.java index c190ef9..d99c08f 100644 --- a/src/com/cooliris/media/MediaFeed.java +++ b/src/com/cooliris/media/MediaFeed.java @@ -191,6 +191,18 @@ public final class MediaFeed implements Runnable { } public MediaSet addMediaSet(final long setId, DataSource dataSource) { + int numSets = mMediaSets.size(); + for (int i = 0; i < numSets; i++) { + MediaSet set = mMediaSets.get(i); + if ((set.mId == setId) && (set.mDataSource == dataSource)) { + // The mediaset already exists, but might be out-dated. + // To avoid the same mediaset being added twice, we delete + // the old one first, then add the new one below. + mMediaSets.remove(i); + break; + } + } + MediaSet mediaSet = new MediaSet(dataSource); mediaSet.mId = setId; mMediaSets.add(mediaSet); |