Merge pull request #6345 from nextcloud/usbr

fix USBR_UNNECESSARY_STORE_BEFORE_RETURN

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-357
+356

src/main/java/com/nextcloud/java/util/Optional.java

@@ -31,6 +31,7 @@ import java.util.NoSuchElementException;
 import androidx.core.util.Consumer;
 import androidx.core.util.ObjectsCompat;
 import androidx.core.util.Supplier;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import kotlin.jvm.functions.Function1;
 
 /**
@@ -84,6 +85,7 @@ public final class Optional<T> {
      */
     public static<T> Optional<T> empty() {
         @SuppressWarnings("unchecked")
+        @SuppressFBWarnings("USBR_UNNECESSARY_STORE_BEFORE_RETURN")
         Optional<T> t = (Optional<T>) EMPTY;
         return t;
     }

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java

@@ -623,8 +623,7 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
             }
             return intArray;
         } else {
-            intArray = new int[0];
-            return intArray;
+            return new int[0];
         }
     }