tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed redundant comparators and sorting operations

Browse source
This commit is contained in:
Karim Abou Zeid 2015-04-18 17:14:47 +02:00
commit ac41e04fd3
13 changed files with 1 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
View file

@ -5,12 +5,10 @@ import android.database.Cursor;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import com.kabouzeid.gramophone.comparator.AlbumAlphabeticComparator;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -37,7 +35,6 @@ public class AlbumLoader {
if (cursor != null) {
cursor.close();
}
Collections.sort(albums, new AlbumAlphabeticComparator());
return albums;
}
@ -102,7 +99,6 @@ public class AlbumLoader {
if (cursor != null) {
cursor.close();
}
Collections.sort(albums, new AlbumAlphabeticComparator());
return albums;
}
}

10
app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java
View file

@ -5,13 +5,10 @@ import android.database.Cursor;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
/**
* @author Karim Abou Zeid (kabouzeid)
@ -19,10 +16,6 @@ import java.util.Comparator;
public class AlbumSongLoader {
public static ArrayList<Song> getAlbumSongList(final Context context, final int albumId) {
return getAlbumSongList(context, albumId, null);
}
public static ArrayList<Song> getAlbumSongList(final Context context, final int albumId, Comparator<Song> comparator) {
Cursor cursor = makeAlbumSongCursor(context, albumId);
ArrayList<Song> songs = new ArrayList<>();
if (cursor != null && cursor.moveToFirst()) {
@ -41,9 +34,6 @@ public class AlbumSongLoader {
}
if (cursor != null)
cursor.close();
if (comparator == null)
comparator = new SongAlphabeticComparator();
Collections.sort(songs, comparator);
return songs;
}

3
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java
View file

@ -5,12 +5,10 @@ import android.database.Cursor;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import com.kabouzeid.gramophone.comparator.AlbumAlphabeticComparator;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -35,7 +33,6 @@ public class ArtistAlbumLoader {
}
if (cursor != null)
cursor.close();
Collections.sort(albums, new AlbumAlphabeticComparator());
return albums;
}

3
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java
View file

@ -5,12 +5,10 @@ import android.database.Cursor;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import com.kabouzeid.gramophone.comparator.ArtistAlphabeticComparator;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -34,7 +32,6 @@ public class ArtistLoader {
}
if (cursor != null)
cursor.close();
Collections.sort(artists, new ArtistAlphabeticComparator());
return artists;
}

3
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java
View file

@ -5,12 +5,10 @@ import android.database.Cursor;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.util.ArrayList;
import java.util.Collections;
/**
* @author Karim Abou Zeid (kabouzeid)
@ -36,7 +34,6 @@ public class ArtistSongLoader {
}
if (cursor != null)
cursor.close();
Collections.sort(songs, new SongAlphabeticComparator());
return songs;
}

3
app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java
View file

@ -6,11 +6,9 @@ import android.provider.BaseColumns;
import android.provider.MediaStore;
import android.provider.MediaStore.Audio.PlaylistsColumns;
import com.kabouzeid.gramophone.comparator.PlaylistAlphabeticComparator;
import com.kabouzeid.gramophone.model.Playlist;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class PlaylistLoader {
@ -43,7 +41,6 @@ public class PlaylistLoader {
}
if (cursor != null)
cursor.close();
Collections.sort(playlists, new PlaylistAlphabeticComparator());
return playlists;
}

4
app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java
View file

@ -5,12 +5,10 @@ import android.database.Cursor;
import android.provider.BaseColumns;
import android.provider.MediaStore;
import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -39,7 +37,6 @@ public class SongLoader {
}
if (cursor != null)
cursor.close();
Collections.sort(songs, new SongAlphabeticComparator());
return songs;
}
@ -95,7 +92,6 @@ public class SongLoader {
if (cursor != null)
cursor.close();
Collections.sort(songs, new SongAlphabeticComparator());
return songs;
}