diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-07-27 22:01:48 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-07-27 22:01:48 -0700 |
commit | 40376e95b425fd82b04eba7e1078800dbf40759f (patch) | |
tree | fbaa5585f5dd092feb22f5924a327d162034eead /app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | |
parent | 900caeea647200ae21f676f355d6fa87557954ce (diff) | |
download | dsub-40376e95b425fd82b04eba7e1078800dbf40759f.tar.gz dsub-40376e95b425fd82b04eba7e1078800dbf40759f.tar.bz2 dsub-40376e95b425fd82b04eba7e1078800dbf40759f.zip |
Show error if network error on hard refresh of album lists
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java')
-rw-r--r-- | app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index 555e308e..c41a4ea5 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -17,7 +17,6 @@ import android.text.SpannableString; import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.util.Log; -import android.view.ContextMenu; import android.view.Display; import android.view.LayoutInflater; import android.view.Menu; @@ -25,7 +24,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.RatingBar; @@ -453,7 +451,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section getShare(share, refresh); } } else if (albumListType != null) { - getAlbumList(albumListType, albumListSize); + getAlbumList(albumListType, albumListSize, refresh); } else { if(showAll) { getRecursiveMusicDirectory(id, name, refresh); @@ -588,7 +586,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section }.execute(); } - private void getAlbumList(final String albumListType, final int size) { + private void getAlbumList(final String albumListType, final int size, final boolean refresh) { if ("newest".equals(albumListType)) { setTitle(R.string.main_albums_newest); } else if ("random".equals(albumListType)) { @@ -614,7 +612,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section if ("starred".equals(albumListType)) { result = service.getStarredList(context, this); } else if(("genres".equals(albumListType) && ServerInfo.checkServerVersion(context, "1.10.0")) || "years".equals(albumListType)) { - result = service.getAlbumList(albumListType, albumListExtra, size, 0, context, this); + result = service.getAlbumList(albumListType, albumListExtra, size, 0, refresh, context, this); if(result.getChildrenSize() == 0 && "genres".equals(albumListType)) { SelectDirectoryFragment.this.albumListType = "genres-songs"; result = service.getSongsByGenre(albumListExtra, size, 0, context, this); @@ -622,7 +620,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section } else if("genres".equals(albumListType) || "genres-songs".equals(albumListType)) { result = service.getSongsByGenre(albumListExtra, size, 0, context, this); } else { - result = service.getAlbumList(albumListType, size, 0, context, this); + result = service.getAlbumList(albumListType, size, 0, refresh, context, this); } return result; } |