From 8d66335bf5500b2aa2d80febb5c90c4237a4579a Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 24 Feb 2015 20:25:21 -0800 Subject: #458 Add musicFolderId checking for additional methods added to 5.2 --- .../daneren2005/dsub/service/RESTMusicService.java | 30 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/service/RESTMusicService.java b/src/github/daneren2005/dsub/service/RESTMusicService.java index 715d07da..341b1158 100644 --- a/src/github/daneren2005/dsub/service/RESTMusicService.java +++ b/src/github/daneren2005/dsub/service/RESTMusicService.java @@ -594,9 +594,22 @@ public class RESTMusicService implements MusicService { @Override public MusicDirectory getStarredList(Context context, ProgressListener progressListener) throws Exception { - Reader reader = getReader(context, progressListener, Util.isTagBrowsing(context, getInstance(context)) ? "getStarred2" : "getStarred", null); + List names = new ArrayList(); + List values = new ArrayList(); + + // Add folder if it was set and is non null + int instance = getInstance(context); + if(Util.getAlbumListsPerFolder(context, instance)) { + String folderId = Util.getSelectedMusicFolderId(context, instance); + if(folderId != null) { + names.add("musicFolderId"); + values.add(folderId); + } + } + + Reader reader = getReader(context, progressListener, Util.isTagBrowsing(context, instance) ? "getStarred2" : "getStarred", null, names, values); try { - return new StarredListParser(context, getInstance(context)).parse(reader, progressListener); + return new StarredListParser(context, instance).parse(reader, progressListener); } finally { Util.close(reader); } @@ -1103,10 +1116,19 @@ public class RESTMusicService implements MusicService { parameterNames.add("offset"); parameterValues.add(offset); - Reader reader = getReader(context, progressListener, "getSongsByGenre", params, parameterNames, parameterValues); + // Add folder if it was set and is non null + int instance = getInstance(context); + if(Util.getAlbumListsPerFolder(context, instance)) { + String folderId = Util.getSelectedMusicFolderId(context, instance); + if(folderId != null) { + parameterNames.add("musicFolderId"); + parameterValues.add(folderId); + } + } + Reader reader = getReader(context, progressListener, "getSongsByGenre", params, parameterNames, parameterValues); try { - return new RandomSongsParser(context, getInstance(context)).parse(reader, progressListener); + return new RandomSongsParser(context, instance).parse(reader, progressListener); } finally { Util.close(reader); } -- cgit v1.2.3 From d489c27ee0bf46cc8bfd47efaa012ad5f09c6b67 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 25 Feb 2015 10:36:10 -0800 Subject: Fix crash for some users when deleting podcasts --- src/github/daneren2005/dsub/util/FileUtil.java | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/util/FileUtil.java b/src/github/daneren2005/dsub/util/FileUtil.java index fbfa6af0..8bd53c0c 100644 --- a/src/github/daneren2005/dsub/util/FileUtil.java +++ b/src/github/daneren2005/dsub/util/FileUtil.java @@ -501,17 +501,24 @@ public class FileUtil { } public static void deleteEmptyDir(File dir) { - File[] children = dir.listFiles(); + try { + File[] children = dir.listFiles(); + if(children == null) { + return; + } - // No songs left in the folder - if(children.length == 1 && children[0].getPath().equals(FileUtil.getAlbumArtFile(dir).getPath())) { - Util.delete(children[0]); - children = dir.listFiles(); - } + // No songs left in the folder + if (children.length == 1 && children[0].getPath().equals(FileUtil.getAlbumArtFile(dir).getPath())) { + Util.delete(children[0]); + children = dir.listFiles(); + } - // Delete empty directory - if (children.length == 0) { - Util.delete(dir); + // Delete empty directory + if (children.length == 0) { + Util.delete(dir); + } + } catch(Exception e) { + Log.w(TAG, "Error while trying to delete empty dir", e); } } -- cgit v1.2.3 From 7a0469ac3ad4ae33aaa5927603ac71f2896d6c96 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 25 Feb 2015 19:12:11 -0800 Subject: Fix crash if numColumns is ever -1 --- src/github/daneren2005/dsub/view/HeaderGridView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/view/HeaderGridView.java b/src/github/daneren2005/dsub/view/HeaderGridView.java index 350e90ee..913fd28d 100644 --- a/src/github/daneren2005/dsub/view/HeaderGridView.java +++ b/src/github/daneren2005/dsub/view/HeaderGridView.java @@ -36,7 +36,7 @@ import java.util.ArrayList; * See {@link HeaderGridView#addFooterView(View, Object, boolean)} */ public class HeaderGridView extends GridView { - + private static final String TAG = HeaderGridView.class.getSimpleName(); public static boolean DEBUG = false; /** @@ -308,7 +308,7 @@ public class HeaderGridView extends GridView { int numColumns = getNumColumnsCompatible(); // adapter has not been set or has no views in it; - if (adapter == null || adapter.getCount() <= numColumns * (mHeaderViewInfos.size() + mFooterViewInfos.size())) { + if (adapter == null || adapter.getCount() <= numColumns * (mHeaderViewInfos.size() + mFooterViewInfos.size()) || mNumColumns == -1) { return -1; } int mColumnWidth = getColumnWidthCompatible(); -- cgit v1.2.3 From af3b5b50d9daa4f38dfd38fb13d49d8167df69da Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 25 Feb 2015 19:13:39 -0800 Subject: Reference local copy of numColumns --- src/github/daneren2005/dsub/view/HeaderGridView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/view/HeaderGridView.java b/src/github/daneren2005/dsub/view/HeaderGridView.java index 913fd28d..8e1eddac 100644 --- a/src/github/daneren2005/dsub/view/HeaderGridView.java +++ b/src/github/daneren2005/dsub/view/HeaderGridView.java @@ -308,7 +308,7 @@ public class HeaderGridView extends GridView { int numColumns = getNumColumnsCompatible(); // adapter has not been set or has no views in it; - if (adapter == null || adapter.getCount() <= numColumns * (mHeaderViewInfos.size() + mFooterViewInfos.size()) || mNumColumns == -1) { + if (adapter == null || adapter.getCount() <= numColumns * (mHeaderViewInfos.size() + mFooterViewInfos.size()) || numColumns == -1) { return -1; } int mColumnWidth = getColumnWidthCompatible(); -- cgit v1.2.3 From f77c52b68219bf2ed51ea397c62c8a229c089d53 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 25 Feb 2015 19:22:37 -0800 Subject: #459 Fix empty podcast/playlist pointlessly using HeaderGridView --- src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index b8a1006b..515a6cd4 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -730,7 +730,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter // Needs to be added here, GB crashes if you to try to remove the header view before adapter is set if(addAlbumHeader && entryAdapter == null) { - if(entries.size() > 0) { + if(entries.size() > 0 || playlistId != null || podcastId != null) { entryList.addHeaderView(albumList); } else { ViewGroup rootGroup = (ViewGroup) rootView.findViewById(R.id.select_album_layout); -- cgit v1.2.3 From e8d2754ede939672bce8305656364adc2b6b9853 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 26 Feb 2015 12:08:17 -0800 Subject: Fix crash if restore is called before buffers created --- src/github/daneren2005/dsub/service/DownloadService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java index 5ab58bf6..24c710dd 100644 --- a/src/github/daneren2005/dsub/service/DownloadService.java +++ b/src/github/daneren2005/dsub/service/DownloadService.java @@ -233,9 +233,9 @@ public class DownloadService extends Service { mediaRouter = new MediaRouteManager(this); instance = this; - lifecycleSupport.onCreate(); shufflePlayBuffer = new ShufflePlayBuffer(this); artistRadioBuffer = new ArtistRadioBuffer(this); + lifecycleSupport.onCreate(); } @Override -- cgit v1.2.3