From 079cf4e7596341b91f54b4a1869775a7a208ecd7 Mon Sep 17 00:00:00 2001 From: George Kankava Date: Wed, 29 Jun 2016 14:04:24 +0400 Subject: [PATCH] squid:S1155 - Collection.isEmpty() should be used to test for emptiness --- .../java/org/xbmc/kore/host/HostConnectionObserver.java | 6 +++--- app/src/main/java/org/xbmc/kore/host/HostManager.java | 6 +++--- .../kore/service/ConnectionObserversManagerService.java | 2 +- .../main/java/org/xbmc/kore/service/library/SyncMovies.java | 2 +- .../main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java | 4 ++-- .../main/java/org/xbmc/kore/ui/MediaFileListFragment.java | 2 +- app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java | 2 +- .../main/java/org/xbmc/kore/utils/FileDownloadHelper.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/xbmc/kore/host/HostConnectionObserver.java b/app/src/main/java/org/xbmc/kore/host/HostConnectionObserver.java index d0b2f4b..09332e0 100644 --- a/app/src/main/java/org/xbmc/kore/host/HostConnectionObserver.java +++ b/app/src/main/java/org/xbmc/kore/host/HostConnectionObserver.java @@ -135,7 +135,7 @@ public class HostConnectionObserver public void run() { final int HTTP_NOTIFICATION_CHECK_INTERVAL = 3000; // If no one is listening to this, just exit - if (playerEventsObservers.size() == 0) return; + if (playerEventsObservers.isEmpty()) return; // Check whats playing checkWhatsPlaying(); @@ -151,7 +151,7 @@ public class HostConnectionObserver final int PING_AFTER_ERROR_CHECK_INTERVAL = 2000, PING_AFTER_SUCCESS_CHECK_INTERVAL = 10000; // If no one is listening to this, just exit - if (playerEventsObservers.size() == 0) return; + if (playerEventsObservers.isEmpty()) return; JSONRPC.Ping ping = new JSONRPC.Ping(); ping.execute(connection, new ApiCallback() { @@ -232,7 +232,7 @@ public class HostConnectionObserver LogUtils.LOGD(TAG, "Unregistering observer. Still got " + playerEventsObservers.size() + " observers."); - if (playerEventsObservers.size() == 0) { + if (playerEventsObservers.isEmpty()) { // No more observers, so unregister us from the host connection, or stop // the http checker thread if (connection.getProtocol() == HostConnection.PROTOCOL_TCP) { diff --git a/app/src/main/java/org/xbmc/kore/host/HostManager.java b/app/src/main/java/org/xbmc/kore/host/HostManager.java index 7f567d3..f078b59 100644 --- a/app/src/main/java/org/xbmc/kore/host/HostManager.java +++ b/app/src/main/java/org/xbmc/kore/host/HostManager.java @@ -119,7 +119,7 @@ public class HostManager { * @return Host list */ public ArrayList getHosts(boolean forcedReload) { - if (forcedReload || (hosts.size() == 0)) { + if (forcedReload || (hosts.isEmpty())) { hosts.clear(); Cursor cursor = context.getContentResolver() @@ -167,7 +167,7 @@ public class HostManager { // No host selected. Check if there are hosts configured and default to the first one if (currentHostId == -1) { - if (hosts.size() > 0) { + if (!hosts.isEmpty()) { currentHostInfo = hosts.get(0); currentHostId = currentHostInfo.getId(); prefs.edit() @@ -424,7 +424,7 @@ public class HostManager { // If we just deleted the current connection, switch to another if ((currentHostInfo != null) && (currentHostInfo.getId() == hostId)) { releaseCurrentHost(); - if (hosts.size() > 0) + if (!hosts.isEmpty()) switchHost(hosts.get(0)); } } diff --git a/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java b/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java index 76fad60..11b91fd 100644 --- a/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java +++ b/app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java @@ -65,7 +65,7 @@ public class ConnectionObserversManagerService extends Service createObservers(); // If no observers created, stop immediately - if (mConnectionObservers.size() == 0) { + if (mConnectionObservers.isEmpty()) { LogUtils.LOGD(TAG, "No observers, stopping observer service."); stopSelf(); } diff --git a/app/src/main/java/org/xbmc/kore/service/library/SyncMovies.java b/app/src/main/java/org/xbmc/kore/service/library/SyncMovies.java index b83f075..b0965e0 100644 --- a/app/src/main/java/org/xbmc/kore/service/library/SyncMovies.java +++ b/app/src/main/java/org/xbmc/kore/service/library/SyncMovies.java @@ -153,7 +153,7 @@ public class SyncMovies extends SyncItem { // First call, delete movies from DB deleteMovies(contentResolver, hostId, -1); } - if (result.size() > 0) { + if (!result.isEmpty()) { insertMovies(orchestrator, contentResolver, result); } diff --git a/app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java b/app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java index f1579b2..7fa6c29 100644 --- a/app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java @@ -339,7 +339,7 @@ public class AlbumDetailsFragment extends AbstractDetailsFragment @Override protected void onDownload() { if ((albumTitle == null) || (albumDisplayArtist == null) || - (songInfoList == null) || (songInfoList.size() == 0)) { + (songInfoList == null) || (songInfoList.isEmpty())) { // Nothing to download Toast.makeText(getActivity(), R.string.no_files_to_download, Toast.LENGTH_SHORT).show(); return; @@ -676,7 +676,7 @@ public class AlbumDetailsFragment extends AbstractDetailsFragment songListView.addView(songView); } while (cursor.moveToNext()); - if (songInfoList.size() > 0) { + if (!songInfoList.isEmpty()) { // Check if download dir exists FileDownloadHelper.SongInfo songInfo = new FileDownloadHelper.SongInfo (albumDisplayArtist, albumTitle, 0, 0, null, null); diff --git a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java index 19b0f36..472e060 100644 --- a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java @@ -367,7 +367,7 @@ public class MediaFileListFragment extends AbstractListFragment { action.execute(hostManager.getConnection(), new ApiCallback() { @Override public void onSuccess(String result) { - while (mediaQueueFileLocation.size() > 0) { + while (!mediaQueueFileLocation.isEmpty()) { queueMediaFile(mediaQueueFileLocation.poll().file); } } diff --git a/app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java b/app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java index 4c9ce45..162d92e 100644 --- a/app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java +++ b/app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java @@ -340,7 +340,7 @@ public class PlaylistFragment extends Fragment private void displayPlaylist(final ListType.ItemsAll getItemResult, final List playlistItems) { - if (playlistItems.size() == 0) { + if (playlistItems.isEmpty()) { displayEmptyPlaylistMessage(); return; } diff --git a/app/src/main/java/org/xbmc/kore/utils/FileDownloadHelper.java b/app/src/main/java/org/xbmc/kore/utils/FileDownloadHelper.java index ccb023f..ab32d2e 100644 --- a/app/src/main/java/org/xbmc/kore/utils/FileDownloadHelper.java +++ b/app/src/main/java/org/xbmc/kore/utils/FileDownloadHelper.java @@ -295,7 +295,7 @@ public class FileDownloadHelper { final List mediaInfoList, final int fileHandlingMode, final Handler callbackHandler) { - if ((mediaInfoList == null) || (mediaInfoList.size() == 0)) + if ((mediaInfoList == null) || (mediaInfoList.isEmpty())) return; if (!checkDownloadDir(context, mediaInfoList.get(0).getAbsoluteDirectoryPath()))