norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix SongTimeline.removeSong

Browse Source 
We were skipping songs as the index changes whenever we remove a song. Use an
iterator so we don't have to worry about that.
This commit is contained in:
Christopher Eby 2011-09-25 04:22:54 -05:00
parent cd935206e4
commit 31651e491e
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/kreed/vanilla/SongTimeline.java
View File

@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.ListIterator;
import android.content.ContentResolver;
import android.content.Context;
@ -601,23 +602,19 @@ public final class SongTimeline {
public void removeSong(long id)
{
synchronized (this) {
ArrayList<Song> songs = mSongs;
saveActiveSongs();
int i = mCurrentPos;
while (--i >= 0) {
if (Song.getId(songs.get(i)) == id) {
songs.remove(i);
--mCurrentPos;
ArrayList<Song> songs = mSongs;
ListIterator<Song> it = songs.listIterator();
while (it.hasNext()) {
int i = it.nextIndex();
if (Song.getId(it.next()) == id) {
if (i < mCurrentPos)
--mCurrentPos;
it.remove();
}
}
for (i = mCurrentPos; i < songs.size(); ++i) {
if (Song.getId(songs.get(i)) == id)
songs.remove(i);
}
broadcastChangedSongs();
}