From f1c606ed35e8f409c817de8d50727779738e489c Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 16 Apr 2014 22:15:30 -0700 Subject: Lint fixes --- src/github/daneren2005/dsub/activity/SubsonicActivity.java | 2 +- .../daneren2005/dsub/activity/SubsonicFragmentActivity.java | 6 +----- src/github/daneren2005/dsub/domain/Bookmark.java | 1 - src/github/daneren2005/dsub/fragments/ChatFragment.java | 5 +---- src/github/daneren2005/dsub/fragments/MainFragment.java | 2 +- src/github/daneren2005/dsub/fragments/SearchFragment.java | 5 +---- .../daneren2005/dsub/fragments/SelectArtistFragment.java | 5 +---- .../daneren2005/dsub/fragments/SelectBookmarkFragment.java | 1 - .../daneren2005/dsub/fragments/SelectDirectoryFragment.java | 8 ++------ src/github/daneren2005/dsub/fragments/SelectListFragment.java | 5 +---- src/github/daneren2005/dsub/provider/DSubWidget4x1.java | 1 - src/github/daneren2005/dsub/provider/DSubWidget4x2.java | 1 - src/github/daneren2005/dsub/provider/DSubWidget4x3.java | 1 - src/github/daneren2005/dsub/provider/DSubWidget4x4.java | 1 - src/github/daneren2005/dsub/provider/DSubWidgetProvider.java | 1 - .../daneren2005/dsub/provider/JukeboxRouteProvider.java | 2 +- .../daneren2005/dsub/provider/MostRecentStubProvider.java | 2 +- .../daneren2005/dsub/provider/PlaylistStubProvider.java | 2 +- src/github/daneren2005/dsub/provider/PodcastStubProvider.java | 2 +- src/github/daneren2005/dsub/provider/StarredStubProvider.java | 2 +- src/github/daneren2005/dsub/service/CachedMusicService.java | 2 +- src/github/daneren2005/dsub/service/ChromeCastController.java | 11 ++++------- src/github/daneren2005/dsub/service/DownloadFile.java | 5 ++--- src/github/daneren2005/dsub/service/DownloadService.java | 5 +---- .../dsub/service/DownloadServiceLifecycleSupport.java | 1 - .../daneren2005/dsub/service/parser/MusicFoldersParser.java | 1 - src/github/daneren2005/dsub/service/parser/ShareParser.java | 1 - .../daneren2005/dsub/service/sync/StarredSyncAdapter.java | 1 - .../daneren2005/dsub/service/sync/SubsonicSyncAdapter.java | 6 +----- src/github/daneren2005/dsub/util/ImageLoader.java | 1 - src/github/daneren2005/dsub/util/MediaRouteManager.java | 1 - src/github/daneren2005/dsub/util/SyncUtil.java | 1 - src/github/daneren2005/dsub/util/Util.java | 7 +------ src/github/daneren2005/dsub/view/AlbumListAdapter.java | 6 +----- src/github/daneren2005/dsub/view/ArtistView.java | 2 +- src/github/daneren2005/dsub/view/AutoRepeatButton.java | 4 ++-- src/github/daneren2005/dsub/view/BookmarkAdapter.java | 2 +- src/github/daneren2005/dsub/view/EntryAdapter.java | 2 +- src/github/daneren2005/dsub/view/ErrorDialog.java | 1 - src/github/daneren2005/dsub/view/UpdateView.java | 2 +- 40 files changed, 31 insertions(+), 86 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index 878c68da..154f7f24 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -323,7 +323,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater menuInflater = getMenuInflater(); - if(drawerOpen == true) { + if(drawerOpen) { menuInflater.inflate(R.menu.drawer_menu, menu); } else if(currentFragment != null) { currentFragment.onCreateOptionsMenu(menu, menuInflater); diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index eee53d71..0bf770f3 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -320,11 +320,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - if(super.onOptionsItemSelected(item)) { - return true; - } else { - return false; - } + return super.onOptionsItemSelected(item); } @Override diff --git a/src/github/daneren2005/dsub/domain/Bookmark.java b/src/github/daneren2005/dsub/domain/Bookmark.java index d1f470ce..4092cec4 100644 --- a/src/github/daneren2005/dsub/domain/Bookmark.java +++ b/src/github/daneren2005/dsub/domain/Bookmark.java @@ -22,7 +22,6 @@ import java.io.Serializable; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; import java.util.Locale; /** diff --git a/src/github/daneren2005/dsub/fragments/ChatFragment.java b/src/github/daneren2005/dsub/fragments/ChatFragment.java index 7443c5d9..0721f995 100644 --- a/src/github/daneren2005/dsub/fragments/ChatFragment.java +++ b/src/github/daneren2005/dsub/fragments/ChatFragment.java @@ -175,11 +175,8 @@ public class ChatFragment extends SubsonicFragment { @Override public boolean onOptionsItemSelected(MenuItem item) { - if(super.onOptionsItemSelected(item)) { - return true; - } + return super.onOptionsItemSelected(item); - return false; } @Override diff --git a/src/github/daneren2005/dsub/fragments/MainFragment.java b/src/github/daneren2005/dsub/fragments/MainFragment.java index d8fa11ac..3a9370a3 100644 --- a/src/github/daneren2005/dsub/fragments/MainFragment.java +++ b/src/github/daneren2005/dsub/fragments/MainFragment.java @@ -358,7 +358,7 @@ public class MainFragment extends SubsonicFragment { progs.add(logcat.getPath()); progs.add("*:I"); - logcatProc = Runtime.getRuntime().exec(progs.toArray(new String[0])); + logcatProc = Runtime.getRuntime().exec(progs.toArray(new String[progs.size()])); logcatProc.waitFor(); } catch(Exception e) { Util.toast(context, "Failed to gather logs"); diff --git a/src/github/daneren2005/dsub/fragments/SearchFragment.java b/src/github/daneren2005/dsub/fragments/SearchFragment.java index 5ef8c1dd..bd92c1bf 100644 --- a/src/github/daneren2005/dsub/fragments/SearchFragment.java +++ b/src/github/daneren2005/dsub/fragments/SearchFragment.java @@ -138,11 +138,8 @@ public class SearchFragment extends SubsonicFragment { @Override public boolean onOptionsItemSelected(MenuItem item) { - if(super.onOptionsItemSelected(item)) { - return true; - } + return super.onOptionsItemSelected(item); - return false; } @Override diff --git a/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java b/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java index 5644c059..d10a9c1b 100644 --- a/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectArtistFragment.java @@ -99,11 +99,8 @@ public class SelectArtistFragment extends SubsonicFragment implements AdapterVie @Override public boolean onOptionsItemSelected(MenuItem item) { - if(super.onOptionsItemSelected(item)) { - return true; - } + return super.onOptionsItemSelected(item); - return false; } @Override diff --git a/src/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java b/src/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java index c91c005c..5ea432e5 100644 --- a/src/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java @@ -19,7 +19,6 @@ package github.daneren2005.dsub.fragments; import android.content.DialogInterface; -import android.util.Log; import android.view.ContextMenu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index c8937ea7..5e3281a4 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -20,7 +20,6 @@ import android.widget.ListView; import android.widget.TextView; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.MusicDirectory; -import github.daneren2005.dsub.domain.MusicFolder; import github.daneren2005.dsub.domain.Share; import github.daneren2005.dsub.util.ImageLoader; import github.daneren2005.dsub.view.EntryAdapter; @@ -259,11 +258,8 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter return true; } - if(super.onOptionsItemSelected(item)) { - return true; - } + return super.onOptionsItemSelected(item); - return false; } @Override @@ -592,7 +588,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter } emptyView.setVisibility(entries.isEmpty() ? View.VISIBLE : View.GONE); - entryAdapter = new EntryAdapter(context, getImageLoader(), entries, (podcastId == null) ? true : false); + entryAdapter = new EntryAdapter(context, getImageLoader(), entries, (podcastId == null)); if(albumListType == null || "starred".equals(albumListType)) { entryList.setAdapter(entryAdapter); } else { diff --git a/src/github/daneren2005/dsub/fragments/SelectListFragment.java b/src/github/daneren2005/dsub/fragments/SelectListFragment.java index d44422ce..5e96ced5 100644 --- a/src/github/daneren2005/dsub/fragments/SelectListFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectListFragment.java @@ -100,11 +100,8 @@ public abstract class SelectListFragment extends SubsonicFragment implements @Override public boolean onOptionsItemSelected(MenuItem item) { - if(super.onOptionsItemSelected(item)) { - return true; - } + return super.onOptionsItemSelected(item); - return false; } @Override diff --git a/src/github/daneren2005/dsub/provider/DSubWidget4x1.java b/src/github/daneren2005/dsub/provider/DSubWidget4x1.java index e00bf02d..9919eb22 100644 --- a/src/github/daneren2005/dsub/provider/DSubWidget4x1.java +++ b/src/github/daneren2005/dsub/provider/DSubWidget4x1.java @@ -18,7 +18,6 @@ */ package github.daneren2005.dsub.provider; -import android.appwidget.AppWidgetManager; import github.daneren2005.dsub.R; public class DSubWidget4x1 extends DSubWidgetProvider { diff --git a/src/github/daneren2005/dsub/provider/DSubWidget4x2.java b/src/github/daneren2005/dsub/provider/DSubWidget4x2.java index 4908f632..2aa6beae 100644 --- a/src/github/daneren2005/dsub/provider/DSubWidget4x2.java +++ b/src/github/daneren2005/dsub/provider/DSubWidget4x2.java @@ -18,7 +18,6 @@ */ package github.daneren2005.dsub.provider; -import android.appwidget.AppWidgetManager; import github.daneren2005.dsub.R; public class DSubWidget4x2 extends DSubWidgetProvider { diff --git a/src/github/daneren2005/dsub/provider/DSubWidget4x3.java b/src/github/daneren2005/dsub/provider/DSubWidget4x3.java index f1908d0d..dfe071c0 100644 --- a/src/github/daneren2005/dsub/provider/DSubWidget4x3.java +++ b/src/github/daneren2005/dsub/provider/DSubWidget4x3.java @@ -18,7 +18,6 @@ */ package github.daneren2005.dsub.provider; -import android.appwidget.AppWidgetManager; import github.daneren2005.dsub.R; public class DSubWidget4x3 extends DSubWidgetProvider { diff --git a/src/github/daneren2005/dsub/provider/DSubWidget4x4.java b/src/github/daneren2005/dsub/provider/DSubWidget4x4.java index 7fee2747..fa53918d 100644 --- a/src/github/daneren2005/dsub/provider/DSubWidget4x4.java +++ b/src/github/daneren2005/dsub/provider/DSubWidget4x4.java @@ -18,7 +18,6 @@ */ package github.daneren2005.dsub.provider; -import android.appwidget.AppWidgetManager; import github.daneren2005.dsub.R; public class DSubWidget4x4 extends DSubWidgetProvider { diff --git a/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java b/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java index be7dedf6..d66bc0ec 100644 --- a/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java +++ b/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java @@ -46,7 +46,6 @@ import github.daneren2005.dsub.activity.SubsonicFragmentActivity; import github.daneren2005.dsub.domain.MusicDirectory; import github.daneren2005.dsub.service.DownloadService; import github.daneren2005.dsub.util.Constants; -import github.daneren2005.dsub.util.FileUtil; import github.daneren2005.dsub.util.ImageLoader; import github.daneren2005.dsub.util.Util; diff --git a/src/github/daneren2005/dsub/provider/JukeboxRouteProvider.java b/src/github/daneren2005/dsub/provider/JukeboxRouteProvider.java index da6e0c2c..d599b784 100644 --- a/src/github/daneren2005/dsub/provider/JukeboxRouteProvider.java +++ b/src/github/daneren2005/dsub/provider/JukeboxRouteProvider.java @@ -36,7 +36,7 @@ import github.daneren2005.dsub.service.DownloadService; */ public class JukeboxRouteProvider extends MediaRouteProvider { public static final String CATEGORY_JUKEBOX_ROUTE = "github.daneren2005.dsub.SERVER_JUKEBOX"; - private static int MAX_VOLUME = 10; + private static final int MAX_VOLUME = 10; private DownloadService downloadService; diff --git a/src/github/daneren2005/dsub/provider/MostRecentStubProvider.java b/src/github/daneren2005/dsub/provider/MostRecentStubProvider.java index 33bc45c3..17447cda 100644 --- a/src/github/daneren2005/dsub/provider/MostRecentStubProvider.java +++ b/src/github/daneren2005/dsub/provider/MostRecentStubProvider.java @@ -41,7 +41,7 @@ public class MostRecentStubProvider extends ContentProvider { @Override public String getType(Uri uri) { - return new String(); + return ""; } @Override diff --git a/src/github/daneren2005/dsub/provider/PlaylistStubProvider.java b/src/github/daneren2005/dsub/provider/PlaylistStubProvider.java index c778e762..e817c047 100644 --- a/src/github/daneren2005/dsub/provider/PlaylistStubProvider.java +++ b/src/github/daneren2005/dsub/provider/PlaylistStubProvider.java @@ -41,7 +41,7 @@ public class PlaylistStubProvider extends ContentProvider { @Override public String getType(Uri uri) { - return new String(); + return ""; } @Override diff --git a/src/github/daneren2005/dsub/provider/PodcastStubProvider.java b/src/github/daneren2005/dsub/provider/PodcastStubProvider.java index 75def009..1c70e7f4 100644 --- a/src/github/daneren2005/dsub/provider/PodcastStubProvider.java +++ b/src/github/daneren2005/dsub/provider/PodcastStubProvider.java @@ -41,7 +41,7 @@ public class PodcastStubProvider extends ContentProvider { @Override public String getType(Uri uri) { - return new String(); + return ""; } @Override diff --git a/src/github/daneren2005/dsub/provider/StarredStubProvider.java b/src/github/daneren2005/dsub/provider/StarredStubProvider.java index bb865096..27a84e3f 100644 --- a/src/github/daneren2005/dsub/provider/StarredStubProvider.java +++ b/src/github/daneren2005/dsub/provider/StarredStubProvider.java @@ -41,7 +41,7 @@ public class StarredStubProvider extends ContentProvider { @Override public String getType(Uri uri) { - return new String(); + return ""; } @Override diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index d98a67e1..d0740704 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -87,7 +87,7 @@ public class CachedMusicService implements MusicService { result = musicService.isLicenseValid(context, progressListener); // Only save a copy license is valid - if(result == true) { + if(result) { FileUtil.serialize(context, (Boolean) result, getCacheName(context, "license")); } } diff --git a/src/github/daneren2005/dsub/service/ChromeCastController.java b/src/github/daneren2005/dsub/service/ChromeCastController.java index 639c7ebe..0ba84c91 100644 --- a/src/github/daneren2005/dsub/service/ChromeCastController.java +++ b/src/github/daneren2005/dsub/service/ChromeCastController.java @@ -54,9 +54,6 @@ public class ChromeCastController extends RemoteController { private CastDevice castDevice; private GoogleApiClient apiClient; - private ConnectionCallbacks connectionCallbacks; - private ConnectionFailedListener connectionFailedListener; - private Cast.Listener castClientListener; private boolean applicationStarted = false; private boolean waitingForReconnect = false; @@ -81,9 +78,9 @@ public class ChromeCastController extends RemoteController { public void create(boolean playing, int seconds) { downloadService.setPlayerState(PlayerState.PREPARING); - connectionCallbacks = new ConnectionCallbacks(playing, seconds); - connectionFailedListener = new ConnectionFailedListener(); - castClientListener = new Cast.Listener() { + ConnectionCallbacks connectionCallbacks = new ConnectionCallbacks(playing, seconds); + ConnectionFailedListener connectionFailedListener = new ConnectionFailedListener(); + Cast.Listener castClientListener = new Cast.Listener() { @Override public void onApplicationStatusChanged() { if (apiClient != null && apiClient.isConnected()) { @@ -96,7 +93,7 @@ public class ChromeCastController extends RemoteController { if (apiClient != null && applicationStarted) { try { gain = Cast.CastApi.getVolume(apiClient); - } catch(Exception e) { + } catch (Exception e) { Log.w(TAG, "Failed to get volume"); } } diff --git a/src/github/daneren2005/dsub/service/DownloadFile.java b/src/github/daneren2005/dsub/service/DownloadFile.java index 9b7dd45d..b8a436cb 100644 --- a/src/github/daneren2005/dsub/service/DownloadFile.java +++ b/src/github/daneren2005/dsub/service/DownloadFile.java @@ -31,7 +31,6 @@ import android.os.PowerManager; import android.util.DisplayMetrics; import android.util.Log; import github.daneren2005.dsub.domain.MusicDirectory; -import github.daneren2005.dsub.service.parser.SubsonicRESTException; import github.daneren2005.dsub.util.SilentBackgroundTask; import github.daneren2005.dsub.util.FileUtil; import github.daneren2005.dsub.util.Util; @@ -296,10 +295,10 @@ public class DownloadFile implements BufferFile { public void setPlaying(boolean isPlaying) { try { - if(saveWhenDone && isPlaying == false) { + if(saveWhenDone && !isPlaying) { Util.renameFile(completeFile, saveFile); saveWhenDone = false; - } else if(completeWhenDone && isPlaying == false) { + } else if(completeWhenDone && !isPlaying) { if(save) { Util.renameFile(partialFile, saveFile); mediaStoreService.saveInMediaStore(DownloadFile.this); diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java index 3637f731..8fecc893 100644 --- a/src/github/daneren2005/dsub/service/DownloadService.java +++ b/src/github/daneren2005/dsub/service/DownloadService.java @@ -99,7 +99,6 @@ public class DownloadService extends Service { private MediaPlayer nextMediaPlayer; private int audioSessionId; private boolean nextSetup = false; - private boolean isPartial = true; private final List downloadList = new ArrayList(); private final List backgroundDownloadList = new ArrayList(); private final List toDelete = new ArrayList(); @@ -128,7 +127,6 @@ public class DownloadService extends Service { private PowerManager.WakeLock wakeLock; private boolean keepScreenOn; private int cachedPosition = 0; - private long downloadRevision; private boolean downloadOngoing = false; private AudioEffectsController effectsController; @@ -1262,7 +1260,7 @@ public class DownloadService extends Service { try { downloadFile.setPlaying(true); final File file = downloadFile.isCompleteFileAvailable() ? downloadFile.getCompleteFile() : downloadFile.getPartialFile(); - isPartial = file.equals(downloadFile.getPartialFile()); + boolean isPartial = file.equals(downloadFile.getPartialFile()); downloadFile.updateModificationDate(); mediaPlayer.setOnCompletionListener(null); @@ -1618,7 +1616,6 @@ public class DownloadService extends Service { if(!backgroundDownloadList.isEmpty()) { Util.showDownloadingNotification(this, currentDownloading, backgroundDownloadList.size()); - downloadRevision = revision; downloadOngoing = true; } else if(backgroundDownloadList.isEmpty() && downloadOngoing) { Util.hideDownloadingNotification(this); diff --git a/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java b/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java index c4a79ee0..5e8b0f8b 100644 --- a/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java +++ b/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java @@ -21,7 +21,6 @@ package github.daneren2005.dsub.service; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java b/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java index 5dfebf27..d6b0fa90 100644 --- a/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java +++ b/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java @@ -27,7 +27,6 @@ import org.xmlpull.v1.XmlPullParser; import android.content.Context; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.MusicFolder; -import github.daneren2005.dsub.domain.Playlist; import github.daneren2005.dsub.util.ProgressListener; /** diff --git a/src/github/daneren2005/dsub/service/parser/ShareParser.java b/src/github/daneren2005/dsub/service/parser/ShareParser.java index 27a53d66..35d6584f 100644 --- a/src/github/daneren2005/dsub/service/parser/ShareParser.java +++ b/src/github/daneren2005/dsub/service/parser/ShareParser.java @@ -20,7 +20,6 @@ package github.daneren2005.dsub.service.parser; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.Share; diff --git a/src/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java b/src/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java index a23fa63f..54c10f41 100644 --- a/src/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java +++ b/src/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java @@ -25,7 +25,6 @@ import android.util.Log; import java.io.File; import java.util.ArrayList; -import java.util.List; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.MusicDirectory; diff --git a/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java b/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java index 1f380e90..eccdaee2 100644 --- a/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java +++ b/src/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java @@ -149,10 +149,6 @@ public class SubsonicSyncAdapter extends AbstractThreadedSyncAdapter { private boolean isValidServer(Context context, int instance) { String url = Util.getRestUrl(context, "null", instance, false); - if(url.contains("demo.subsonic.org") || url.contains("yourhost")) { - return false; - } else { - return true; - } + return !(url.contains("demo.subsonic.org") || url.contains("yourhost")); } } diff --git a/src/github/daneren2005/dsub/util/ImageLoader.java b/src/github/daneren2005/dsub/util/ImageLoader.java index c3008b3a..b1b00cc5 100644 --- a/src/github/daneren2005/dsub/util/ImageLoader.java +++ b/src/github/daneren2005/dsub/util/ImageLoader.java @@ -215,7 +215,6 @@ public class ImageLoader { } } imageView.setImageDrawable(drawable); - return; } } diff --git a/src/github/daneren2005/dsub/util/MediaRouteManager.java b/src/github/daneren2005/dsub/util/MediaRouteManager.java index 9b4110f3..b227916f 100644 --- a/src/github/daneren2005/dsub/util/MediaRouteManager.java +++ b/src/github/daneren2005/dsub/util/MediaRouteManager.java @@ -15,7 +15,6 @@ package github.daneren2005.dsub.util; -import android.support.v7.media.MediaControlIntent; import android.support.v7.media.MediaRouteProvider; import android.support.v7.media.MediaRouteSelector; import android.support.v7.media.MediaRouter; diff --git a/src/github/daneren2005/dsub/util/SyncUtil.java b/src/github/daneren2005/dsub/util/SyncUtil.java index 3a338543..0c567681 100644 --- a/src/github/daneren2005/dsub/util/SyncUtil.java +++ b/src/github/daneren2005/dsub/util/SyncUtil.java @@ -5,7 +5,6 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.support.v4.app.NotificationCompat; -import android.util.Log; import java.io.File; import java.io.Serializable; diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java index 8488420e..10b0a429 100644 --- a/src/github/daneren2005/dsub/util/Util.java +++ b/src/github/daneren2005/dsub/util/Util.java @@ -39,7 +39,6 @@ import android.media.AudioManager.OnAudioFocusChangeListener; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiManager; -import android.opengl.Visibility; import android.os.Build; import android.os.Environment; import android.os.Handler; @@ -173,11 +172,7 @@ public final class Util { public static boolean checkServerVersion(Context context, String requiredVersion) { Version version = Util.getServerRestVersion(context); Version required = new Version(requiredVersion); - if(version != null && version.compareTo(required) >= 0) { - return true; - } else { - return false; - } + return version != null && version.compareTo(required) >= 0; } public static int getServerCount(Context context) { diff --git a/src/github/daneren2005/dsub/view/AlbumListAdapter.java b/src/github/daneren2005/dsub/view/AlbumListAdapter.java index f5f3e5fc..308eb7d7 100644 --- a/src/github/daneren2005/dsub/view/AlbumListAdapter.java +++ b/src/github/daneren2005/dsub/view/AlbumListAdapter.java @@ -63,11 +63,7 @@ public class AlbumListAdapter extends EndlessAdapter { result = service.getAlbumList(type, size, offset, context, null); } entries = result.getChildren(); - if(entries.size() > 0) { - return true; - } else { - return false; - } + return entries.size() > 0; } @Override diff --git a/src/github/daneren2005/dsub/view/ArtistView.java b/src/github/daneren2005/dsub/view/ArtistView.java index 6f54e800..23ce4f9d 100644 --- a/src/github/daneren2005/dsub/view/ArtistView.java +++ b/src/github/daneren2005/dsub/view/ArtistView.java @@ -27,7 +27,7 @@ import android.widget.TextView; import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.Artist; import github.daneren2005.dsub.util.FileUtil; -import github.daneren2005.dsub.util.Util; + import java.io.File; /** diff --git a/src/github/daneren2005/dsub/view/AutoRepeatButton.java b/src/github/daneren2005/dsub/view/AutoRepeatButton.java index 798c1649..cb2d2a51 100644 --- a/src/github/daneren2005/dsub/view/AutoRepeatButton.java +++ b/src/github/daneren2005/dsub/view/AutoRepeatButton.java @@ -8,8 +8,8 @@ import android.widget.ImageButton; public class AutoRepeatButton extends ImageButton { - private long initialRepeatDelay = 1000; - private long repeatIntervalInMilliseconds = 300; + private static final long initialRepeatDelay = 1000; + private static final long repeatIntervalInMilliseconds = 300; private boolean doClick = true; private Runnable repeatEvent = null; diff --git a/src/github/daneren2005/dsub/view/BookmarkAdapter.java b/src/github/daneren2005/dsub/view/BookmarkAdapter.java index bcddc574..b0541397 100644 --- a/src/github/daneren2005/dsub/view/BookmarkAdapter.java +++ b/src/github/daneren2005/dsub/view/BookmarkAdapter.java @@ -20,7 +20,7 @@ package github.daneren2005.dsub.view; import android.content.Context; -import android.util.Log; + import java.util.List; import android.view.View; import android.view.ViewGroup; diff --git a/src/github/daneren2005/dsub/view/EntryAdapter.java b/src/github/daneren2005/dsub/view/EntryAdapter.java index 22ca384c..4fa5cdf0 100644 --- a/src/github/daneren2005/dsub/view/EntryAdapter.java +++ b/src/github/daneren2005/dsub/view/EntryAdapter.java @@ -19,7 +19,7 @@ package github.daneren2005.dsub.view; import android.content.Context; -import android.util.Log; + import java.util.List; import android.view.View; diff --git a/src/github/daneren2005/dsub/view/ErrorDialog.java b/src/github/daneren2005/dsub/view/ErrorDialog.java index e72b1934..0b9d05a0 100644 --- a/src/github/daneren2005/dsub/view/ErrorDialog.java +++ b/src/github/daneren2005/dsub/view/ErrorDialog.java @@ -20,7 +20,6 @@ package github.daneren2005.dsub.view; import android.app.Activity; import android.app.AlertDialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; diff --git a/src/github/daneren2005/dsub/view/UpdateView.java b/src/github/daneren2005/dsub/view/UpdateView.java index f59cee3f..66f34471 100644 --- a/src/github/daneren2005/dsub/view/UpdateView.java +++ b/src/github/daneren2005/dsub/view/UpdateView.java @@ -131,7 +131,7 @@ public class UpdateView extends LinearLayout { return; } - List views = new ArrayList();; + List views = new ArrayList(); for (UpdateView view : INSTANCES.keySet()) { if (view.isShown()) { views.add(view); -- cgit v1.2.3