diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2020-02-03 23:17:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 23:17:58 +0100 |
commit | 7e2fd0b1d744e01759c4a5feb697eeb32553e3a7 (patch) | |
tree | 02c11f1db69914896893f6d67a8bcbccafff8785 /core/src/main/java | |
parent | da890bba52dd5da3460fc620d0095d452dad9531 (diff) | |
parent | be076be7376b1cfbd69d512589379eb8fa8a2ae4 (diff) | |
download | AntennaPod-7e2fd0b1d744e01759c4a5feb697eeb32553e3a7.zip |
Merge pull request #3820 from ByteHamster/checkstyle
Enforce more checkstyle rules
Diffstat (limited to 'core/src/main/java')
6 files changed, 13 insertions, 26 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java b/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java index 61e4e599b..4c11d0489 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java +++ b/core/src/main/java/de/danoeh/antennapod/core/backup/OpmlBackupAgent.java @@ -27,7 +27,6 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; -import de.danoeh.antennapod.core.BuildConfig; import de.danoeh.antennapod.core.export.opml.OpmlElement; import de.danoeh.antennapod.core.export.opml.OpmlReader; import de.danoeh.antennapod.core.export.opml.OpmlWriter; @@ -45,18 +44,6 @@ public class OpmlBackupAgent extends BackupAgentHelper { addHelper(OPML_BACKUP_KEY, new OpmlBackupHelper(this)); } - private static void LOGD(String tag, String msg) { - if (BuildConfig.DEBUG && Log.isLoggable(tag, Log.DEBUG)) { - Log.d(tag, msg); - } - } - - private static void LOGD(String tag, String msg, Throwable tr) { - if (BuildConfig.DEBUG && Log.isLoggable(tag, Log.DEBUG)) { - Log.d(tag, msg, tr); - } - } - /** * Class for backing up and restoring the OPML file. */ @@ -98,7 +85,7 @@ public class OpmlBackupAgent extends BackupAgentHelper { // Compare checksum of new and old file to see if we need to perform a backup at all if (digester != null) { byte[] newChecksum = digester.digest(); - LOGD(TAG, "New checksum: " + new BigInteger(1, newChecksum).toString(16)); + Log.d(TAG, "New checksum: " + new BigInteger(1, newChecksum).toString(16)); // Get the old checksum if (oldState != null) { @@ -108,10 +95,10 @@ public class OpmlBackupAgent extends BackupAgentHelper { if (len != -1) { byte[] oldChecksum = new byte[len]; inState.read(oldChecksum); - LOGD(TAG, "Old checksum: " + new BigInteger(1, oldChecksum).toString(16)); + Log.d(TAG, "Old checksum: " + new BigInteger(1, oldChecksum).toString(16)); if (Arrays.equals(oldChecksum, newChecksum)) { - LOGD(TAG, "Checksums are the same; won't backup"); + Log.d(TAG, "Checksums are the same; won't backup"); return; } } @@ -120,7 +107,7 @@ public class OpmlBackupAgent extends BackupAgentHelper { writeNewStateDescription(newState, newChecksum); } - LOGD(TAG, "Backing up OPML"); + Log.d(TAG, "Backing up OPML"); byte[] bytes = byteStream.toByteArray(); data.writeEntityHeader(OPML_ENTITY_KEY, bytes.length); data.writeEntityData(bytes, bytes.length); @@ -138,10 +125,10 @@ public class OpmlBackupAgent extends BackupAgentHelper { @Override public void restoreEntity(BackupDataInputStream data) { - LOGD(TAG, "Backup restore"); + Log.d(TAG, "Backup restore"); if (!OPML_ENTITY_KEY.equals(data.getKey())) { - LOGD(TAG, "Unknown entity key: " + data.getKey()); + Log.d(TAG, "Unknown entity key: " + data.getKey()); return; } @@ -167,7 +154,7 @@ public class OpmlBackupAgent extends BackupAgentHelper { try { downloader.downloadFeed(mContext, feed); } catch (DownloadRequestException e) { - LOGD(TAG, "Error while restoring/downloading feed", e); + Log.d(TAG, "Error while restoring/downloading feed", e); } } } catch (XmlPullParserException e) { 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 cb66a1671..37deb6dc0 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 @@ -1329,7 +1329,7 @@ public class PlaybackService extends MediaBrowserServiceCompat { @Override public void onReceive(Context context, Intent intent) { - if (isInitialStickyBroadcast ()) { + if (isInitialStickyBroadcast()) { // Don't pause playback after we just started, just because the receiver // delivers the current headset state (instead of a change) return; 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 e2da40ec3..4f4ee4721 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 @@ -689,7 +689,7 @@ public final class DBReader { * Returns credentials based on image URL * * @param imageUrl The URL of the image - * @return Credentials in format "<Username>:<Password>", empty String if no authorization given + * @return Credentials in format "Username:Password", empty String if no authorization given */ public static String getImageAuthentication(final String imageUrl) { Log.d(TAG, "getImageAuthentication() called with: " + "imageUrl = [" + imageUrl + "]"); diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/LongList.java b/core/src/main/java/de/danoeh/antennapod/core/util/LongList.java index fdc244517..742920702 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/LongList.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/LongList.java @@ -154,7 +154,7 @@ public final class LongList { growIfNeeded(); - System.arraycopy (values, n, values, n+1, size - n); + System.arraycopy(values, n, values, n+1, size - n); values[n] = value; size++; } @@ -211,7 +211,7 @@ public final class LongList { throw new IndexOutOfBoundsException("n < 0"); } size--; - System.arraycopy (values, index + 1, values, index, size - index); + System.arraycopy(values, index + 1, values, index, size - index); } /** diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/TimeSpeedConverter.java b/core/src/main/java/de/danoeh/antennapod/core/util/TimeSpeedConverter.java index 5d44c14b8..bbfe528be 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/TimeSpeedConverter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/TimeSpeedConverter.java @@ -10,7 +10,7 @@ public class TimeSpeedConverter { } /** Convert millisecond according to the current playback speed - * @param time: time to convert + * @param time time to convert * @return converted time (can be < 0 if time is < 0) */ public int convert(int time) { diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java index 3550f28c6..84d98a905 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/syndication/HtmlToPlainText.java @@ -57,7 +57,7 @@ public class HtmlToPlainText { * Use this method to determine if a given text has any HTML tag * * @param str String to be tested for presence of HTML content - * @return <b>True</b> if text contains any HTML tags</br><b>False</b> is no HTML tag is found + * @return <b>True</b> if text contains any HTML tags<br /><b>False</b> is no HTML tag is found */ private static boolean isHtml(String str) { final String HTML_TAG_PATTERN = "<(\"[^\"]*\"|'[^']*'|[^'\">])*>"; |