From 710964b47df92cbdb1ab41b562c80dd9d7c28ce8 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 18 Mar 2022 19:58:59 +0100
Subject: [PATCH 1/2] Update checkstyle to 10.0 and fix various related issues

- Put checkstyle files into checkstyle/ subfolder so that the gradle task does not implicitly depend on the whole project, fixing many warnings during build and possibly increasing build performance.
- Remove unused SuppressionXpathFilter from config file.
- Remove outdated suppressions from suppressions file.
---
 app/build.gradle                                         | 4 ++--
 checkstyle.xml => checkstyle/checkstyle.xml              | 9 +--------
 .../suppressions.xml                                     | 8 --------
 3 files changed, 3 insertions(+), 18 deletions(-)
 rename checkstyle.xml => checkstyle/checkstyle.xml (94%)
 rename checkstyle-suppressions.xml => checkstyle/suppressions.xml (74%)

diff --git a/app/build.gradle b/app/build.gradle
index 51762db75..0299c0fd5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,7 +98,7 @@ android {
 }
 
 ext {
-    checkstyleVersion = '9.3'
+    checkstyleVersion = '10.0'
 
     androidxLifecycleVersion = '2.3.1'
     androidxRoomVersion = '2.4.2'
@@ -121,7 +121,7 @@ configurations {
 }
 
 checkstyle {
-    getConfigDirectory().set(rootProject.file("."))
+    getConfigDirectory().set(rootProject.file("checkstyle"))
     ignoreFailures false
     showViolations true
     toolVersion = checkstyleVersion
diff --git a/checkstyle.xml b/checkstyle/checkstyle.xml
similarity index 94%
rename from checkstyle.xml
rename to checkstyle/checkstyle.xml
index 61145d61f..282358f6a 100644
--- a/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -22,7 +22,7 @@
 
     <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
     <module name="SuppressionFilter">
-        <property name="file" value="${config_loc}/checkstyle-suppressions.xml" />
+        <property name="file" value="${config_loc}/suppressions.xml" />
         <property name="optional" value="true"/>
     </module>
 
@@ -180,12 +180,5 @@
         <module name="UpperEll"/>
 
         <module name="SuppressWarningsHolder" />
-
-        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
-        <module name="SuppressionXpathFilter">
-            <property name="file" value="${org.checkstyle.sun.suppressionxpathfilter.config}"
-                      default="checkstyle-xpath-suppressions.xml" />
-            <property name="optional" value="true"/>
-        </module>
     </module>
 </module>
diff --git a/checkstyle-suppressions.xml b/checkstyle/suppressions.xml
similarity index 74%
rename from checkstyle-suppressions.xml
rename to checkstyle/suppressions.xml
index 3c5e4891a..8b9e50afa 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -7,18 +7,10 @@
     files="LocalItemListAdapter.java"
     lines="232,304"/>
 
-  <suppress checks="FinalParameters"
-    files="InfoListAdapter.java"
-    lines="253,325"/>
-
   <suppress checks="EmptyBlock"
     files="ContentSettingsFragment.java"
     lines="227,245"/>
 
-  <suppress checks="LineLength"
-    files="WebMWriter.java"
-    lines="156,158"/>
-
   <suppress checks="FileLength"
     files="Player.java"/>
 

From 53f8415e9b898942b3995532d66f0ccb844f7f24 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Fri, 18 Mar 2022 23:57:11 +0100
Subject: [PATCH 2/2] Use @SuppressWarnings for checkstyle suppressions &
 warnings

It's better to use @SuppressWarnings instead of the suppressions file, so that the warning suppression is at the place where it acts.
---
 .../org/schabi/newpipe/local/LocalItemListAdapter.java    | 2 ++
 app/src/main/java/org/schabi/newpipe/player/Player.java   | 1 +
 .../schabi/newpipe/player/playqueue/PlayQueueItem.java    | 1 +
 .../org/schabi/newpipe/streams/Mp4FromDashWriter.java     | 1 +
 .../main/java/org/schabi/newpipe/streams/WebMWriter.java  | 1 +
 checkstyle/suppressions.xml                               | 8 +-------
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 5d81c0069..05e2fdac0 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -228,6 +228,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         return count;
     }
 
+    @SuppressWarnings("FinalParameters")
     @Override
     public int getItemViewType(int position) {
         if (DEBUG) {
@@ -300,6 +301,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
+    @SuppressWarnings("FinalParameters")
     @Override
     public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
         if (DEBUG) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 76f7a8101..1051f678f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -682,6 +682,7 @@ public final class Player implements
     //////////////////////////////////////////////////////////////////////////*/
     //region Playback initialization via intent
 
+    @SuppressWarnings("MethodLength")
     public void handleIntent(@NonNull final Intent intent) {
         // fail fast if no play queue was provided
         final String queueCache = intent.getStringExtra(PLAY_QUEUE_KEY);
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
index f7dfc562e..bf31ea9b1 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
@@ -52,6 +52,7 @@ public class PlayQueueItem implements Serializable {
                 item.getUploaderUrl(), item.getStreamType());
     }
 
+    @SuppressWarnings("ParameterNumber")
     private PlayQueueItem(@Nullable final String name, @Nullable final String url,
                           final int serviceId, final long duration,
                           @Nullable final String thumbnailUrl, @Nullable final String uploader,
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index ca3da9d24..889cc85e6 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -142,6 +142,7 @@ public class Mp4FromDashWriter {
         outStream = null;
     }
 
+    @SuppressWarnings("MethodLength")
     public void build(final SharpStream output) throws IOException {
         if (done) {
             throw new RuntimeException("already done");
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
index ebae3812c..2b69f23ac 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -121,6 +121,7 @@ public class WebMWriter implements Closeable {
         clustersOffsetsSizes = null;
     }
 
+    @SuppressWarnings("MethodLength")
     public void build(final SharpStream out) throws IOException, RuntimeException {
         if (!out.canRewind()) {
             throw new IOException("The output stream must be allow seek");
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 8b9e50afa..3f31de48a 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -3,13 +3,7 @@
   "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-  <suppress checks="FinalParameters"
-    files="LocalItemListAdapter.java"
-    lines="232,304"/>
-
-  <suppress checks="EmptyBlock"
-    files="ContentSettingsFragment.java"
-    lines="227,245"/>
+  <!-- Use @SuppressWarnings("...") if it is possible, only use this file if it is not -->
 
   <suppress checks="FileLength"
     files="Player.java"/>