Merge pull request #4204 from TacoTheDank/develop

Lint fixes

17 files changed, 42 insertions, 150 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
index 2610d253f..3edecd35c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
@@ -50,7 +50,7 @@ public abstract class FeedComponent {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || !(o instanceof FeedComponent)) return false;
+        if (!(o instanceof FeedComponent)) return false;
 
         FeedComponent that = (FeedComponent) o;
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
index 7e1a5fd9b..d1c90cfa7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
@@ -481,7 +481,7 @@ public class FeedMedia extends FeedFile implements Playable {
 
     @Override
     public void onPlaybackStart() {
-        startPosition = (position > 0) ? position : 0;
+        startPosition = Math.max(position, 0);
         playedDurationWhenStarted = played_duration;
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 876251563..597d88787 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -826,8 +826,8 @@ public class UserPreferences {
     public static VideoBackgroundBehavior getVideoBackgroundBehavior() {
         switch (prefs.getString(PREF_VIDEO_BEHAVIOR, "pip")) {
             case "stop": return VideoBackgroundBehavior.STOP;
-            case "pip": return VideoBackgroundBehavior.PICTURE_IN_PICTURE;
             case "continue": return VideoBackgroundBehavior.CONTINUE_PLAYING;
+            case "pip": //Deliberate fall-through
             default: return VideoBackgroundBehavior.PICTURE_IN_PICTURE;
         }
     }
@@ -977,11 +977,11 @@ public class UserPreferences {
 
     public static BackButtonBehavior getBackButtonBehavior() {
         switch (prefs.getString(PREF_BACK_BUTTON_BEHAVIOR, "default")) {
-            case "default": return BackButtonBehavior.DEFAULT;
             case "drawer": return BackButtonBehavior.OPEN_DRAWER;
             case "doubletap": return BackButtonBehavior.DOUBLE_TAP;
             case "prompt": return BackButtonBehavior.SHOW_PROMPT;
             case "page": return BackButtonBehavior.GO_TO_PAGE;
+            case "default": // Deliberate fall-through
             default: return BackButtonBehavior.DEFAULT;
         }
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
index f39ac0df8..7585e9d33 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
@@ -121,7 +121,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
             views.setOnClickPendingIntent(R.id.layout_left, startMediaPlayer);
 
             try {
-                Bitmap icon = null;
+                Bitmap icon;
                 int iconSize = getResources().getDimensionPixelSize(android.R.dimen.app_icon_size);
                 icon = Glide.with(PlayerWidgetJobService.this)
                         .asBitmap()
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index e0c23bdac..889018c45 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -154,8 +154,8 @@ public class AntennapodHttpClient {
 
             // workaround for Android 4.x for certain web sites.
             // see: https://github.com/square/okhttp/issues/4053#issuecomment-402579554
-            List<CipherSuite> cipherSuites = new ArrayList<>();
-            cipherSuites.addAll(ConnectionSpec.MODERN_TLS.cipherSuites());
+            List<CipherSuite> cipherSuites = new ArrayList<>(
+                    ConnectionSpec.MODERN_TLS.cipherSuites());
             cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
             cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
index 78c4d3f48..3f503c6b4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
@@ -115,7 +115,7 @@ public class DownloadRequest implements Parcelable {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || !(o instanceof DownloadRequest)) return false;
+        if (!(o instanceof DownloadRequest)) return false;
 
         DownloadRequest that = (DownloadRequest) o;
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index 54b8d321a..96665bd51 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -189,7 +189,7 @@ public class HttpDownloader extends Downloader {
             }
 
             byte[] buffer = new byte[BUFFER_SIZE];
-            int count = 0;
+            int count;
             request.setStatusMsg(R.string.download_running);
             Log.d(TAG, "Getting size of download");
             request.setSize(responseBody.contentLength() + request.getSoFar());
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 08480fddb..fbf061966 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -419,7 +419,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                 e.printStackTrace();
             }
         } else if (parentId.startsWith("FeedId:")) {
-            Long feedId = Long.parseLong(parentId.split(":")[1]);
+            long feedId = Long.parseLong(parentId.split(":")[1]);
             List<FeedItem> feedItems = DBReader.getFeedItemList(DBReader.getFeed(feedId));
             for (FeedItem feedItem : feedItems) {
                 if (feedItem.getMedia() != null && feedItem.getMedia().getMediaItem() != null) {
@@ -1140,13 +1140,11 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                 case INITIALIZING:
                     state = PlaybackStateCompat.STATE_CONNECTING;
                     break;
-                case INITIALIZED:
-                case INDETERMINATE:
-                    state = PlaybackStateCompat.STATE_NONE;
-                    break;
                 case ERROR:
                     state = PlaybackStateCompat.STATE_ERROR;
                     break;
+                case INITIALIZED: // Deliberate fall-through
+                case INDETERMINATE:
                 default:
                     state = PlaybackStateCompat.STATE_NONE;
                     break;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java
index 4bb88200a..3239f3378 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java
@@ -183,15 +183,14 @@ public class PlaybackServiceNotificationBuilder {
             notification.addAction(R.drawable.ic_notification_pause, //pause action
                     context.getString(R.string.pause_label),
                     pauseButtonPendingIntent);
-            compactActionList.add(numActions++);
         } else {
             PendingIntent playButtonPendingIntent = getPendingIntentForMediaAction(
                     KeyEvent.KEYCODE_MEDIA_PLAY, numActions);
             notification.addAction(R.drawable.ic_notification_play, //play action
                     context.getString(R.string.play_label),
                     playButtonPendingIntent);
-            compactActionList.add(numActions++);
         }
+        compactActionList.add(numActions++);
 
         // ff follows play, then we have skip (if it's present)
         PendingIntent ffButtonPendingIntent = getPendingIntentForMediaAction(
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
index b0b6e164d..b967577af 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ShakeListener.java
@@ -58,7 +58,6 @@ class ShakeListener implements SensorEventListener
 
     @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        return;
     }
 
 }
\ No newline at end of file
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index c30f46315..a13f03e9f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -72,19 +72,13 @@ public final class DBReader {
 
     @NonNull
     private static List<Feed> getFeedList(PodDBAdapter adapter) {
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getAllFeedsCursor();
+        try (Cursor cursor = adapter.getAllFeedsCursor()) {
             List<Feed> feeds = new ArrayList<>(cursor.getCount());
             while (cursor.moveToNext()) {
                 Feed feed = extractFeedFromCursorRow(cursor);
                 feeds.add(feed);
             }
             return feeds;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
     }
 
@@ -96,18 +90,13 @@ public final class DBReader {
     public static List<String> getFeedListDownloadUrls() {
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getFeedCursorDownloadUrls();
+        try (Cursor cursor = adapter.getFeedCursorDownloadUrls()) {
             List<String> result = new ArrayList<>(cursor.getCount());
             while (cursor.moveToNext()) {
                 result.add(cursor.getString(1));
             }
             return result;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -172,9 +161,7 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getAllItemsOfFeedCursor(feed);
+        try (Cursor cursor = adapter.getAllItemsOfFeedCursor(feed)) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             Collections.sort(items, new FeedItemPubdateComparator());
             for (FeedItem item : items) {
@@ -182,9 +169,6 @@ public final class DBReader {
             }
             return items;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -226,16 +210,10 @@ public final class DBReader {
     @NonNull
     static List<FeedItem> getQueue(PodDBAdapter adapter) {
         Log.d(TAG, "getQueue()");
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getQueueCursor();
+        try (Cursor cursor = adapter.getQueueCursor()) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             loadAdditionalFeedItemListData(items);
             return items;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
     }
 
@@ -257,18 +235,12 @@ public final class DBReader {
     }
 
     private static LongList getQueueIDList(PodDBAdapter adapter) {
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getQueueIDCursor();
+        try (Cursor cursor = adapter.getQueueIDCursor()) {
             LongList queueIds = new LongList(cursor.getCount());
             while (cursor.moveToNext()) {
                 queueIds.add(cursor.getLong(0));
             }
             return queueIds;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
     }
 
@@ -302,17 +274,12 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getDownloadedItemsCursor();
+        try (Cursor cursor = adapter.getDownloadedItemsCursor()) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             loadAdditionalFeedItemListData(items);
             Collections.sort(items, new FeedItemPubdateComparator());
             return items;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -328,16 +295,11 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getPlayedItemsCursor();
+        try (Cursor cursor = adapter.getPlayedItemsCursor()) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             loadAdditionalFeedItemListData(items);
             return items;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -355,16 +317,11 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getNewItemsCursor(offset, limit);
+        try (Cursor cursor = adapter.getNewItemsCursor(offset, limit)) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             loadAdditionalFeedItemListData(items);
             return items;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -381,16 +338,11 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getFavoritesCursor(offset, limit);
+        try (Cursor cursor = adapter.getFavoritesCursor(offset, limit)) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             loadAdditionalFeedItemListData(items);
             return items;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -400,18 +352,13 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getFavoritesCursor(0, Integer.MAX_VALUE);
+        try (Cursor cursor = adapter.getFavoritesCursor(0, Integer.MAX_VALUE)) {
             LongList favoriteIDs = new LongList(cursor.getCount());
             while (cursor.moveToNext()) {
                 favoriteIDs.add(cursor.getLong(0));
             }
             return favoriteIDs;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -428,16 +375,11 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getRecentlyPublishedItemsCursor(offset, limit);
+        try (Cursor cursor = adapter.getRecentlyPublishedItemsCursor(offset, limit)) {
             List<FeedItem> items = extractItemlistFromCursor(adapter, cursor);
             loadAdditionalFeedItemListData(items);
             return items;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -492,9 +434,7 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getDownloadLogCursor(DOWNLOAD_LOG_SIZE);
+        try (Cursor cursor = adapter.getDownloadLogCursor(DOWNLOAD_LOG_SIZE)) {
             List<DownloadStatus> downloadLog = new ArrayList<>(cursor.getCount());
             while (cursor.moveToNext()) {
                 downloadLog.add(DownloadStatus.fromCursor(cursor));
@@ -502,9 +442,6 @@ public final class DBReader {
             Collections.sort(downloadLog, new DownloadStatusComparator());
             return downloadLog;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -521,9 +458,7 @@ public final class DBReader {
 
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getDownloadLog(Feed.FEEDFILETYPE_FEED, feedId);
+        try (Cursor cursor = adapter.getDownloadLog(Feed.FEEDFILETYPE_FEED, feedId)) {
             List<DownloadStatus> downloadLog = new ArrayList<>(cursor.getCount());
             while (cursor.moveToNext()) {
                 downloadLog.add(DownloadStatus.fromCursor(cursor));
@@ -531,9 +466,6 @@ public final class DBReader {
             Collections.sort(downloadLog, new DownloadStatusComparator());
             return downloadLog;
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
@@ -560,9 +492,7 @@ public final class DBReader {
     @Nullable
     static Feed getFeed(final long feedId, PodDBAdapter adapter) {
         Feed feed = null;
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getFeedCursor(feedId);
+        try (Cursor cursor = adapter.getFeedCursor(feedId)) {
             if (cursor.moveToNext()) {
                 feed = extractFeedFromCursorRow(cursor);
                 feed.setItems(getFeedItemList(feed));
@@ -570,10 +500,6 @@ public final class DBReader {
                 Log.e(TAG, "getFeed could not find feed with id " + feedId);
             }
             return feed;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
     }
 
@@ -582,9 +508,7 @@ public final class DBReader {
         Log.d(TAG, "Loading feeditem with id " + itemId);
 
         FeedItem item = null;
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getFeedItemCursor(Long.toString(itemId));
+        try (Cursor cursor = adapter.getFeedItemCursor(Long.toString(itemId))) {
             if (cursor.moveToNext()) {
                 List<FeedItem> list = extractItemlistFromCursor(adapter, cursor);
                 if (!list.isEmpty()) {
@@ -593,10 +517,6 @@ public final class DBReader {
                 }
             }
             return item;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
     }
 
@@ -631,9 +551,7 @@ public final class DBReader {
     @Nullable
     private static FeedItem getFeedItemByUrl(final String podcastUrl, final String episodeUrl, PodDBAdapter adapter) {
         Log.d(TAG, "Loading feeditem with podcast url " + podcastUrl + " and episode url " + episodeUrl);
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getFeedItemCursor(podcastUrl, episodeUrl);
+        try (Cursor cursor = adapter.getFeedItemCursor(podcastUrl, episodeUrl)) {
             if (!cursor.moveToNext()) {
                 return null;
             }
@@ -642,10 +560,6 @@ public final class DBReader {
                 return list.get(0);
             }
             return null;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
     }
 
@@ -668,10 +582,8 @@ public final class DBReader {
     }
 
     private static String getImageAuthentication(final String imageUrl, PodDBAdapter adapter) {
-        String credentials = null;
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getImageAuthenticationCursor(imageUrl);
+        String credentials;
+        try (Cursor cursor = adapter.getImageAuthenticationCursor(imageUrl)) {
             if (cursor.moveToFirst()) {
                 String username = cursor.getString(0);
                 String password = cursor.getString(1);
@@ -683,10 +595,6 @@ public final class DBReader {
             } else {
                 credentials = "";
             }
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
         }
         return credentials;
     }
@@ -720,9 +628,7 @@ public final class DBReader {
         Log.d(TAG, "loadDescriptionOfFeedItem() called with: " + "item = [" + item + "]");
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
-        Cursor cursor = null;
-        try {
-            cursor = adapter.getDescriptionOfItem(item);
+        try (Cursor cursor = adapter.getDescriptionOfItem(item)) {
             if (cursor.moveToFirst()) {
                 int indexDescription = cursor.getColumnIndex(PodDBAdapter.KEY_DESCRIPTION);
                 String description = cursor.getString(indexDescription);
@@ -732,9 +638,6 @@ public final class DBReader {
                 item.setContentEncoded(contentEncoded);
             }
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             adapter.close();
         }
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index e6d47b32a..8a3f44e18 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -1218,7 +1218,7 @@ public class PodDBAdapter {
     public Cursor searchItems(long feedID, String searchQuery) {
         String preparedQuery = prepareSearchQuery(searchQuery);
 
-        String queryFeedId = "";
+        String queryFeedId;
         if (feedID != 0) {
             // search items in specific feed
             queryFeedId = KEY_FEED + " = " + feedID;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java b/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java
index eae7a08af..62c8ce5f3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/sync/gpoddernet/GpodnetService.java
@@ -21,7 +21,6 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import org.apache.commons.io.Charsets;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -34,6 +33,7 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -505,7 +505,7 @@ public class GpodnetService implements ISyncService {
         RequestBody requestBody = RequestBody.create(TEXT, "");
         Request request = new Request.Builder().url(url).post(requestBody).build();
         try {
-            String credential = Credentials.basic(username, password, Charsets.UTF_8);
+            String credential = Credentials.basic(username, password, Charset.forName("UTF-8"));
             Request authRequest = request.newBuilder().header("Authorization", credential).build();
             Response response = httpClient.newCall(authRequest).execute();
             checkStatusCode(response);
@@ -519,8 +519,8 @@ public class GpodnetService implements ISyncService {
 
     private String executeRequest(@NonNull Request.Builder requestB) throws GpodnetServiceException {
         Request request = requestB.build();
-        String responseString = null;
-        Response response = null;
+        String responseString;
+        Response response;
         ResponseBody body = null;
         try {
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
index 366f86707..813c6d0f7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
@@ -39,7 +39,7 @@ public class RewindAfterPauseUtils {
 
             int newPosition = currentPosition - (int) rewindTime;
 
-            return newPosition > 0 ? newPosition : 0;
+            return Math.max(newPosition, 0);
         } else {
             return currentPosition;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/comparator/ChapterStartTimeComparator.java b/core/src/main/java/de/danoeh/antennapod/core/util/comparator/ChapterStartTimeComparator.java
index 8bd23c2ed..920a1ef8a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/comparator/ChapterStartTimeComparator.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/comparator/ChapterStartTimeComparator.java
@@ -8,13 +8,7 @@ public class ChapterStartTimeComparator implements Comparator<Chapter> {
 
 	@Override
 	public int compare(Chapter lhs, Chapter rhs) {
-		if (lhs.getStart() == rhs.getStart()) {
-			return 0;
-		} else if (lhs.getStart() < rhs.getStart()) {
-			return -1;
-		} else {
-			return 1;
-		}
+		return Long.compare(lhs.getStart(), rhs.getStart());
 	}
 
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
index 991089910..a8ca43ccb 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
@@ -118,9 +118,8 @@ public class AutoUpdateManager {
      */
     public static void runImmediate(@NonNull Context context) {
         Log.d(TAG, "Run auto update immediately in background.");
-        new Thread(() -> {
-            DBTasks.refreshAllFeeds(context.getApplicationContext(), true);
-        }, "ManualRefreshAllFeeds").start();
+        new Thread(() -> DBTasks.refreshAllFeeds(
+                context.getApplicationContext(), true), "ManualRefreshAllFeeds").start();
     }
 
     public static void disableAutoUpdate(Context context) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/OggInputStream.java b/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/OggInputStream.java
index cdf171299..9277af6e6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/OggInputStream.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/OggInputStream.java
@@ -39,7 +39,7 @@ class OggInputStream extends InputStream {
 	private void readOggPage() throws IOException {
 		// find OggS
 		int[] buffer = new int[4];
-		int c = 0;
+		int c;
 		boolean isInOggS = false;
 		while ((c = input.read()) != -1) {
 			switch (c) {