Merge pull request #3547 from ByteHamster/checkstyle-change

Checkstyle change

8 files changed, 37 insertions, 12 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 7c1bcf034..b8ae7bb5b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -331,7 +331,7 @@ public class QueueFragment extends Fragment {
                     conDialog.createNewDialog().show();
                     return true;
                 case R.id.episode_actions:
-                    ((MainActivity) requireActivity()) .loadChildFragment(
+                    ((MainActivity) requireActivity()).loadChildFragment(
                             EpisodesApplyActionFragment.newInstance(queue, ACTION_DELETE | ACTION_REMOVE_FROM_QUEUE));
                     return true;
                 case R.id.queue_sort_episode_title_asc:
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
index 440660942..34e8684ed 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
@@ -134,7 +134,8 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
             builder1.show();
         });
         builder.onNegative((dialog, which) -> {
-            int hourOfDay = 7, minute = 0;
+            int hourOfDay = 7;
+            int minute = 0;
             int[] updateTime = UserPreferences.getUpdateTimeOfDay();
             if (updateTime.length == 2) {
                 hourOfDay = updateTime[0];
diff --git a/build.gradle b/build.gradle
index d8e1a6c32..8ac4eda94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,4 +91,5 @@ task checkstyle(type: Checkstyle) {
     classpath = files()
     source "${project.rootDir}"
     exclude("**/gen/**")
+    exclude("**/generated/**")
 }
diff --git a/config/checkstyle/checkstyle-best-practice.xml b/config/checkstyle/checkstyle-best-practice.xml
index 66ce0dcc4..617fc4c78 100644
--- a/config/checkstyle/checkstyle-best-practice.xml
+++ b/config/checkstyle/checkstyle-best-practice.xml
@@ -187,11 +187,6 @@
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-        </module>
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceBefore">
             <property name="tokens"
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 0a5b47eb8..4f916ec3f 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -11,6 +11,13 @@
 
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format"
+             value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+             value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
         <module name="AvoidEscapedUnicodeCharacters">
             <property name="allowEscapesForControlCharacters" value="true"/>
             <property name="allowByTailComment" value="true"/>
@@ -25,6 +32,7 @@
                       value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
         <module name="FallThrough"/>
         <module name="UpperEll"/>
         <module name="ModifierOrder"/>
@@ -68,6 +76,11 @@
             <message key="ws.notPreceded"
                      value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+             value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
         <module name="AnnotationLocation">
             <property name="id" value="AnnotationLocationMostCases"/>
             <property name="tokens"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/DownloaderUpdate.java b/core/src/main/java/de/danoeh/antennapod/core/event/DownloaderUpdate.java
index 9acd7728a..f549940b7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/event/DownloaderUpdate.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/event/DownloaderUpdate.java
@@ -30,7 +30,8 @@ public class DownloaderUpdate {
 
     DownloaderUpdate(@NonNull List<Downloader> downloaders) {
         this.downloaders = downloaders;
-        LongList feedIds1 = new LongList(), mediaIds1 = new LongList();
+        LongList feedIds1 = new LongList();
+        LongList mediaIds1 = new LongList();
         for(Downloader d1 : downloaders) {
             int type = d1.getDownloadRequest().getFeedfileType();
             long id = d1.getDownloadRequest().getFeedfileId();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
index cbd22ceb0..3cc906b7f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
@@ -83,7 +83,16 @@ public class FastBlurTransformation extends BitmapTransformation {
         int r[] = new int[wh];
         int g[] = new int[wh];
         int b[] = new int[wh];
-        int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
+        int rsum;
+        int gsum;
+        int bsum;
+        int x;
+        int y;
+        int i;
+        int p;
+        int yp;
+        int yi;
+        int yw;
         int vmin[] = new int[Math.max(w, h)];
 
         int divsum = (div + 1) >> 1;
@@ -101,8 +110,12 @@ public class FastBlurTransformation extends BitmapTransformation {
         int[] sir;
         int rbs;
         int r1 = radius + 1;
-        int routsum, goutsum, boutsum;
-        int rinsum, ginsum, binsum;
+        int routsum;
+        int goutsum;
+        int boutsum;
+        int rinsum;
+        int ginsum;
+        int binsum;
 
         for (y = 0; y < h; y++) {
             rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
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 7290b9d98..8589e1283 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
@@ -206,7 +206,8 @@ public class ID3Reader {
 	private int readUnicodeString(StringBuilder strBuffer, InputStream input, int max, Charset charset)
 			throws IOException, ID3ReaderException {
 		byte[] buffer = new byte[max];
-        int c, cZero = -1;
+        int c;
+        int cZero = -1;
         int i = 0;
         for (; i < max; i++) {
             c = input.read();