Merge pull request #5652 from nextcloud/codacy

Codacy improvements

src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java

@@ -253,8 +253,7 @@ public class UserAccountManagerImpl implements UserAccountManager {
         try {
             Account currentPlatformAccount = getCurrentAccount();
             return new OwnCloudAccount(currentPlatformAccount, context);
-        } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException |
-            IllegalArgumentException ex) {
+        } catch (AccountUtils.AccountNotFoundException | IllegalArgumentException ex) {
             return null;
         }
     }

src/main/java/com/owncloud/android/MainApp.java

@@ -22,7 +22,6 @@
 package com.owncloud.android;
 
 import android.Manifest;
-import android.accounts.Account;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -76,7 +75,6 @@ import com.owncloud.android.jobs.NCJobCreator;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
-import com.owncloud.android.ui.activity.ContactsPreferenceActivity;
 import com.owncloud.android.ui.activity.SyncedFoldersActivity;
 import com.owncloud.android.ui.notifications.NotificationUtils;
 import com.owncloud.android.utils.DisplayUtils;

src/main/java/com/owncloud/android/datamodel/MediaProvider.java

@@ -207,7 +207,6 @@ public final class MediaProvider {
         String dataPath = MainApp.getStoragePath() + File.separator + MainApp.getDataFolder();
 
         if (cursorFolders != null) {
-            String folderName;
             String fileSortOrder = MediaStore.Video.Media.DATE_TAKEN + " DESC LIMIT " + itemLimit;
             Cursor cursorVideos;
 

src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -133,7 +133,7 @@ public class FileMenuFilter {
             List<Integer> toShow = new ArrayList<>();
             List<Integer> toHide = new ArrayList<>();
 
-            filter(toShow, toHide, inSingleFileFragment, isMediaSupported, menu);
+            filter(toShow, toHide, inSingleFileFragment, isMediaSupported);
 
             for (int i : toShow) {
                 showMenuItem(menu.findItem(i));
@@ -181,9 +181,7 @@ public class FileMenuFilter {
     }
 
     /**
-     * Performs the real filtering, to be applied in the {@link Menu} by the caller methods.
-     *
-     * Decides what actions must be shown and hidden.
+     * Decides what actions must be shown and hidden implementing the different rule sets.
      *
      * @param toShow                List to save the options that must be shown in the menu.
      * @param toHide                List to save the options that must be shown in the menu.
@@ -193,8 +191,7 @@ public class FileMenuFilter {
     private void filter(List<Integer> toShow,
                         List<Integer> toHide,
                         boolean inSingleFileFragment,
-                        boolean isMediaSupported,
-                        Menu menu) {
+                        boolean isMediaSupported) {
         boolean synchronizing = anyFileSynchronizing();
         OCCapability capability = componentsGetter.getStorageManager().getCapability(account.name);
         boolean endToEndEncryptionEnabled = capability.getEndToEndEncryption().isTrue();

src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java

@@ -21,7 +21,6 @@
 
 package com.owncloud.android.providers;
 
-import android.accounts.Account;
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.database.Cursor;

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -90,7 +90,6 @@ public class FileContentProvider extends ContentProvider {
     private static final String TEXT = " TEXT, ";
     private static final String ALTER_TABLE = "ALTER TABLE ";
     private static final String ADD_COLUMN = " ADD COLUMN ";
-    private static final String REMOVE_COLUMN = " REMOVE COLUMN ";
     private static final String UPGRADE_VERSION_MSG = "OUT of the ADD in onUpgrade; oldVersion == %d, newVersion == %d";
     private static final int SINGLE_PATH_SEGMENT = 1;
     public static final int ARBITRARY_DATA_TABLE_INTRODUCTION_VERSION = 20;

src/main/java/com/owncloud/android/ui/activities/StickyHeaderItemDecoration.java

@@ -21,7 +21,6 @@
 package com.owncloud.android.ui.activities;
 
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

src/main/java/com/owncloud/android/ui/activity/EditorWebView.java

@@ -66,8 +66,6 @@ public abstract class EditorWebView extends ExternalSiteWebView {
 
     private Unbinder unbinder;
 
-    private static final String TAG = EditorWebView.class.getSimpleName();
-
     protected void loadUrl(String url) {
         onUrlLoaded(url);
     }

src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java

@@ -43,8 +43,6 @@ import androidx.annotation.NonNull;
 
 public class RemoteTrashbinRepository implements TrashbinRepository {
 
-    private static final String TAG = RemoteTrashbinRepository.class.getSimpleName();
-
     private final User user;
     private final ClientFactory clientFactory;
 

src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -27,7 +27,6 @@
 
 package com.owncloud.android.utils;
 
-import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -88,13 +87,10 @@ import java.math.BigDecimal;
 import java.net.IDN;
 import java.nio.charset.Charset;
 import java.text.DateFormat;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.java

@@ -22,17 +22,12 @@
  */
 package com.owncloud.android.utils.glide;
 
-import android.accounts.Account;
-
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.nextcloud.client.account.CurrentAccountProvider;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.network.ClientFactory;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.utils.Log_OC;