Change sort option to be sort by year or by alphabetical

4 files changed, 7 insertions, 7 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89492cd7..77f18ea9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -284,8 +284,8 @@
 	<string name="settings.theme_fullscreen_summary">Hide as many UI elements as Android will allow</string>

 	<string name="settings.track_title">Display Track #</string>

 	<string name="settings.track_summary">Display Track # in front of songs if one exists</string>

-	<string name="settings.custom_sort">Custom Sort</string>

-	<string name="settings.custom_sort_summary">Override default server sorting to sort by disc number and by year.</string>

+	<string name="settings.custom_sort">Sort By Year</string>

+	<string name="settings.custom_sort_summary">Sort albums by year, or by alphabetical</string>

 	<string name="settings.open_to_library">Open To Library</string>

 	<string name="settings.open_to_library_summary">Open directly to the library screen instead of opening to home.</string>

     <string name="settings.network_title">Network</string>

diff --git a/src/github/daneren2005/dsub/domain/MusicDirectory.java b/src/github/daneren2005/dsub/domain/MusicDirectory.java
index 363a1540..492726f9 100644
--- a/src/github/daneren2005/dsub/domain/MusicDirectory.java
+++ b/src/github/daneren2005/dsub/domain/MusicDirectory.java
@@ -102,8 +102,8 @@ public class MusicDirectory implements Serializable {
 		return children.size();
 	}
 	
-	public void sortChildren() {
-		EntryComparator.sort(children);
+	public void sortChildren(boolean byYear) {
+		EntryComparator.sort(children, byYear);
 	}
 
     public static class Entry implements Serializable {
diff --git a/src/github/daneren2005/dsub/service/OfflineMusicService.java b/src/github/daneren2005/dsub/service/OfflineMusicService.java
index a92e41d1..04955cc3 100644
--- a/src/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/src/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -134,7 +134,7 @@ public class OfflineMusicService extends RESTMusicService {
 				result.addChild(createEntry(context, file, name, true, isPodcast));
 			}
 		}
-		result.sortChildren();
+		result.sortChildren(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_CUSTOM_SORT_ENABLED, true));
 		return result;
 	}
 
diff --git a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
index e705c54d..95ee1744 100644
--- a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
+++ b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
@@ -97,8 +97,8 @@ public class MusicDirectoryParser extends MusicDirectoryEntryParser {
         validate();
 		
 		// Only apply sorting on server version 4.7 and greater, where disc is supported
-		if(Util.checkServerVersion(context, "1.8.0") && Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_CUSTOM_SORT_ENABLED, true)) {
-			dir.sortChildren();
+		if(Util.checkServerVersion(context, "1.8.0")) {
+			dir.sortChildren(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_CUSTOM_SORT_ENABLED, true));
 		}
 
         return dir;