From 3399be1290592eff1b6ad5dd1a9b7807f7e7fcaa Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Wed, 25 Mar 2020 22:17:29 +0100 Subject: Cleaned up some Lint warnings --- .../core/gpoddernet/model/GpodnetEpisodeAction.java | 16 ++++++++-------- .../core/service/playback/PlaybackService.java | 2 +- .../service/playback/PlaybackServiceTaskManager.java | 4 ++-- .../java/de/danoeh/antennapod/core/storage/DBWriter.java | 2 +- .../danoeh/antennapod/core/util/id3reader/ID3Reader.java | 6 ++---- .../danoeh/antennapod/core/util/playback/Timeline.java | 2 +- 6 files changed, 15 insertions(+), 17 deletions(-) (limited to 'core/src/main/java/de/danoeh') diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java index 330cde525..71129f2e2 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java @@ -199,14 +199,14 @@ public class GpodnetEpisodeAction { } public String writeToString() { - return this.podcast + "\t" + - this.episode + "\t" + - this.deviceId + "\t" + - this.action + "\t" + - this.timestamp.getTime() + "\t" + - String.valueOf(this.started) + "\t" + - String.valueOf(this.position) + "\t" + - String.valueOf(this.total); + return this.podcast + "\t" + + this.episode + "\t" + + this.deviceId + "\t" + + this.action + "\t" + + this.timestamp.getTime() + "\t" + + this.started + "\t" + + this.position + "\t" + + this.total; } /** 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 b92dd217d..7b950846e 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 @@ -377,7 +377,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { private MediaBrowserCompat.MediaItem createBrowsableMediaItemForFeed(Feed feed) { MediaDescriptionCompat.Builder builder = new MediaDescriptionCompat.Builder() - .setMediaId("FeedId:" + Long.toString(feed.getId())) + .setMediaId("FeedId:" + feed.getId()) .setTitle(feed.getTitle()) .setDescription(feed.getDescription()) .setSubtitle(feed.getCustomTitle()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java index 62eda415e..904c1508d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java @@ -216,11 +216,11 @@ public class PlaybackServiceTaskManager { * @throws java.lang.IllegalArgumentException if waitingTime <= 0 */ public synchronized void setSleepTimer(long waitingTime, boolean shakeToReset, boolean vibrate) { - if(waitingTime <= 0) { + if (waitingTime <= 0) { throw new IllegalArgumentException("Waiting time <= 0"); } - Log.d(TAG, "Setting sleep timer to " + Long.toString(waitingTime) + " milliseconds"); + Log.d(TAG, "Setting sleep timer to " + waitingTime + " milliseconds"); if (isSleepTimerActive()) { sleepTimerFuture.cancel(true); } diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java index a8cc6cbee..96dfc5aa7 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java @@ -93,7 +93,7 @@ public class DBWriter { private static boolean deleteFeedMediaSynchronous( @NonNull Context context, @NonNull FeedMedia media) { Log.i(TAG, String.format("Requested to delete FeedMedia [id=%d, title=%s, downloaded=%s", - media.getId(), media.getEpisodeTitle(), String.valueOf(media.isDownloaded()))); + media.getId(), media.getEpisodeTitle(), media.isDownloaded())); if (media.isDownloaded()) { // delete downloaded media file File mediaFile = new File(media.getFile_url()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java index dfc21a5f2..124388254 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3Reader.java @@ -43,9 +43,7 @@ public class ID3Reader { onNoTagHeaderFound(); } else { rc = onStartTagHeader(tagHeader); - if (rc == ACTION_SKIP) { - onEndTag(); - } else { + if (rc != ACTION_SKIP) { while (readerPosition < tagHeader.getSize()) { FrameHeader frameHeader = createFrameHeader(readChars(input, HEADER_LENGTH)); if (checkForNullString(frameHeader.getId())) { @@ -59,8 +57,8 @@ public class ID3Reader { skipBytes(input, frameHeader.getSize()); } } - onEndTag(); } + onEndTag(); } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java index 0fd658853..be4c0668c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java @@ -37,7 +37,7 @@ import de.danoeh.antennapod.core.util.ShownotesProvider; public class Timeline { private static final String TAG = "Timeline"; - private static final Pattern TIMECODE_LINK_REGEX = Pattern.compile("antennapod://timecode/((\\d+))"); + private static final Pattern TIMECODE_LINK_REGEX = Pattern.compile("antennapod://timecode/(\\d+)"); private static final String TIMECODE_LINK = "%s"; private static final Pattern TIMECODE_REGEX = Pattern.compile("\\b((\\d+):)?(\\d+):(\\d{2})\\b"); private static final Pattern LINE_BREAK_REGEX = Pattern.compile("
"); -- cgit v1.2.3