Fix web commits

3 files changed, 12 insertions, 3 deletions

diff --git a/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index b77f02c9..522b2841 100644
--- a/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -31,6 +31,7 @@ import android.os.Bundle;
 import android.os.Handler;

 import android.support.v4.view.MenuItemCompat;

 import android.support.v7.app.MediaRouteButton;

+import android.util.Log;

 import android.view.ContextMenu;

 import android.view.Display;

 import android.view.GestureDetector;

@@ -61,6 +62,8 @@ import github.daneren2005.dsub.service.DownloadFile;
 import github.daneren2005.dsub.service.DownloadService;

 import github.daneren2005.dsub.service.MusicService;

 import github.daneren2005.dsub.service.MusicServiceFactory;

+import github.daneren2005.dsub.service.OfflineException;

+import github.daneren2005.dsub.service.ServerTooOldException;

 import github.daneren2005.dsub.util.Constants;

 import github.daneren2005.dsub.util.SilentBackgroundTask;

 import github.daneren2005.dsub.view.DownloadFileAdapter;

@@ -1404,7 +1407,7 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 				currentSong.setBookmark(oldBookmark);

 				

 				String msg;

-				if(error instanceof OfflineException || error instance of ServerTooOldException) {

+				if(error instanceof OfflineException || error instanceof ServerTooOldException) {

 					msg = getErrorMessage(error);

 				} else {

 					msg = context.getResources().getString(R.string.download_save_bookmark_failed) + getErrorMessage(error);

diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index 9ea84d41..aaaeebfd 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -1064,7 +1064,12 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
 				musicService.setStarred(entries, artists, albums, false, this, context);

 

 				for(MusicDirectory.Entry entry: unstar) {

-					setEntryStarred(entry, false);

+					new EntryInstanceUpdater(entry) {

+						@Override

+						public void update(MusicDirectory.Entry found) {

+							found.setStarred(false);

+						}

+					}.execute();

 				}

 

 				return null;

diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 30369bd4..b259987d 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -51,6 +51,7 @@ import github.daneren2005.dsub.activity.DownloadActivity;
 import github.daneren2005.dsub.activity.SubsonicActivity;

 import github.daneren2005.dsub.activity.SubsonicFragmentActivity;

 import github.daneren2005.dsub.domain.Artist;

+import github.daneren2005.dsub.domain.Bookmark;

 import github.daneren2005.dsub.domain.Genre;

 import github.daneren2005.dsub.domain.MusicDirectory;

 import github.daneren2005.dsub.domain.Playlist;

@@ -1589,7 +1590,7 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
 		public void execute() {

 			DownloadService downloadService = getDownloadService();

 			if(downloadService != null && !entry.isDirectory()) {

-				private boolean serializeChanges = false;

+				boolean serializeChanges = false;

 				List<DownloadFile> downloadFiles = downloadService.getDownloads();

 				for(DownloadFile file: downloadFiles) {

 					Entry check = file.getSong();