From e40893a136f1ec1ef59bb3016a24df9bd10c5cf7 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 19 Jun 2020 10:37:25 +0200
Subject: [PATCH] Use always recommended spotbug version, defined by plugin
 exclude data binding generated classes

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 build.gradle                                              | 4 +---
 spotbugs-filter.xml                                       | 1 +
 .../owncloud/android/ui/adapter/SyncedFolderAdapter.java  | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index fc995d308c..875b7c1639 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,9 +96,7 @@ for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()
     }
 }
 
-spotbugs {
-    toolVersion = '3.1.12'
-}
+
 
 android {
     lintOptions {
diff --git a/spotbugs-filter.xml b/spotbugs-filter.xml
index 6443a1c75e..57d393da0b 100644
--- a/spotbugs-filter.xml
+++ b/spotbugs-filter.xml
@@ -32,6 +32,7 @@
         <Or>
             <Class name="~.*BindingImpl"/>
             <Class name="~.*\.DataBinderMapperImpl" />
+            <Class name="~.*Binding" />
         </Or>
     </Match>
 
diff --git a/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
index 8f34e43bba..6cd4a5d704 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
@@ -65,10 +65,10 @@ public class SyncedFolderAdapter extends SectionedRecyclerViewAdapter<SectionedV
     private final List<SyncedFolderDisplayItem> syncFolderItems;
     private final List<SyncedFolderDisplayItem> filteredSyncFolderItems;
     private final boolean light;
-    private final int VIEW_TYPE_EMPTY = Integer.MAX_VALUE;
-    private final int VIEW_TYPE_ITEM = 1;
-    private final int VIEW_TYPE_HEADER = 2;
-    private final int VIEW_TYPE_FOOTER = 3;
+    private static final int VIEW_TYPE_EMPTY = Integer.MAX_VALUE;
+    private static final int VIEW_TYPE_ITEM = 1;
+    private static final int VIEW_TYPE_HEADER = 2;
+    private static final int VIEW_TYPE_FOOTER = 3;
     private boolean hideItems;
 
     public SyncedFolderAdapter(Context context, Clock clock, int gridWidth, ClickListener listener, boolean light) {