From 9e929ebb08b73fa949af1922970ad2767981ae08 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sat, 8 Apr 2017 11:32:57 +0200
Subject: [PATCH] cleanup some old sorting code

* No need to call loadSortOrder()
* All adapters are now sortable
---
 assets/about.html                               |  3 +++
 .../android/vanilla/LibraryActivity.java        |  1 -
 .../android/vanilla/LibraryPagerAdapter.java    | 17 ++---------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/assets/about.html b/assets/about.html
index a65a2c11..ed94c9f3 100644
--- a/assets/about.html
+++ b/assets/about.html
@@ -29,6 +29,9 @@ function show(n) {
 <b>Changelog</b> [<a href='javascript:show("changelog")'>show</a>]
 <pre id='changelog'>
 
+<b>1.0.52</b>
+- <b>NEW</b> Files can now be sorted
+
 <b>1.0.51</b>
 - <b>FIX</b> Read MIDI files
 - <b>FIX</b> Fix tabs on Android 7.0
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index 402ade4a..30b5bc07 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -759,7 +759,6 @@ public class LibraryActivity
 		LibraryAdapter adapter = mCurrentAdapter;
 		menu.findItem(MENU_GO_HOME).setVisible(
 				adapter != null && adapter.getMediaType() == MediaUtils.TYPE_FILE);
-		menu.findItem(MENU_SORT).setEnabled(adapter != null);
 		return super.onPrepareOptionsMenu(menu);
 	}
 
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
index 99e1a632..895831e6 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
@@ -347,8 +347,8 @@ public class LibraryPagerAdapter
 				mHeaderViews.add(header);
 			}
 			view.setAdapter(adapter);
-			if (adapter instanceof SortableAdapter)
-				loadSortOrder((SortableAdapter)adapter);
+
+			loadSortOrder((SortableAdapter)adapter);
 
 			adapter.setFilter(mFilter);
 
@@ -473,35 +473,30 @@ public class LibraryPagerAdapter
 				mPendingArtistLimiter = null;
 			} else {
 				mArtistAdapter.setLimiter(null);
-				loadSortOrder(mArtistAdapter);
 				requestRequery(mArtistAdapter);
 			}
 			if (mAlbArtAdapter == null) {
 				mPendingAlbArtLimiter = null;
 			} else {
 				mAlbArtAdapter.setLimiter(null);
-				loadSortOrder(mAlbArtAdapter);
 				requestRequery(mAlbArtAdapter);
 			}
 			if (mComposerAdapter == null) {
 				mPendingComposerLimiter = null;
 			} else {
 				mComposerAdapter.setLimiter(null);
-				loadSortOrder(mComposerAdapter);
 				requestRequery(mComposerAdapter);
 			}
 			if (mAlbumAdapter == null) {
 				mPendingAlbumLimiter = null;
 			} else {
 				mAlbumAdapter.setLimiter(null);
-				loadSortOrder(mAlbumAdapter);
 				requestRequery(mAlbumAdapter);
 			}
 			if (mSongAdapter == null) {
 				mPendingSongLimiter = null;
 			} else {
 				mSongAdapter.setLimiter(null);
-				loadSortOrder(mSongAdapter);
 				requestRequery(mSongAdapter);
 			}
 		}
@@ -525,7 +520,6 @@ public class LibraryPagerAdapter
 				mPendingSongLimiter = limiter;
 			} else {
 				mSongAdapter.setLimiter(limiter);
-				loadSortOrder(mSongAdapter);
 				requestRequery(mSongAdapter);
 			}
 			tab = getMediaTypePosition(MediaUtils.TYPE_SONG);
@@ -537,14 +531,12 @@ public class LibraryPagerAdapter
 				mPendingAlbumLimiter = limiter;
 			} else {
 				mAlbumAdapter.setLimiter(limiter);
-				loadSortOrder(mAlbumAdapter);
 				requestRequery(mAlbumAdapter);
 			}
 			if (mSongAdapter == null) {
 				mPendingSongLimiter = limiter;
 			} else {
 				mSongAdapter.setLimiter(limiter);
-				loadSortOrder(mSongAdapter);
 				requestRequery(mSongAdapter);
 			}
 			tab = getMediaTypePosition(MediaUtils.TYPE_ALBUM);
@@ -556,35 +548,30 @@ public class LibraryPagerAdapter
 				mPendingArtistLimiter = limiter;
 			} else {
 				mArtistAdapter.setLimiter(limiter);
-				loadSortOrder(mArtistAdapter);
 				requestRequery(mArtistAdapter);
 			}
 			if (mAlbArtAdapter == null) {
 				mPendingAlbArtLimiter = limiter;
 			} else {
 				mAlbArtAdapter.setLimiter(limiter);
-				loadSortOrder(mAlbArtAdapter);
 				requestRequery(mAlbArtAdapter);
 			}
 			if (mComposerAdapter == null) {
 				mPendingComposerLimiter = limiter;
 			} else {
 				mComposerAdapter.setLimiter(limiter);
-				loadSortOrder(mComposerAdapter);
 				requestRequery(mComposerAdapter);
 			}
 			if (mAlbumAdapter == null) {
 				mPendingAlbumLimiter = limiter;
 			} else {
 				mAlbumAdapter.setLimiter(limiter);
-				loadSortOrder(mAlbumAdapter);
 				requestRequery(mAlbumAdapter);
 			}
 			if (mSongAdapter == null) {
 				mPendingSongLimiter = limiter;
 			} else {
 				mSongAdapter.setLimiter(limiter);
-				loadSortOrder(mSongAdapter);
 				requestRequery(mSongAdapter);
 			}
 			tab = getMediaTypePosition(MediaUtils.TYPE_ARTIST);