Răsfoiți Sursa

codacy: avoid using implementation types like 'HashMap'; use the interface instead

AndyScherzinger 6 ani în urmă
părinte
comite
333dfcb1ed

+ 2 - 2
src/main/java/com/owncloud/android/datamodel/DecryptedFolderMetadata.java

@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Decrypted class representation of metadata json of folder metadata
+ * Decrypted class representation of metadata json of folder metadata.
  */
 public class DecryptedFolderMetadata {
     private Metadata metadata;
@@ -36,7 +36,7 @@ public class DecryptedFolderMetadata {
         this.files = new HashMap<>();
     }
 
-    public DecryptedFolderMetadata(Metadata metadata, HashMap<String, DecryptedFile> files) {
+    public DecryptedFolderMetadata(Metadata metadata, Map<String, DecryptedFile> files) {
         this.metadata = metadata;
         this.files = files;
     }

+ 3 - 3
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -1466,8 +1466,8 @@ public class FileDataStorageManager {
         }
     }
 
-    public void saveSharesDB(ArrayList<OCShare> shares) {
-        ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>();
+    public void saveSharesDB(List<OCShare> shares) {
+        ArrayList<ContentProviderOperation> operations = new ArrayList<>();
 
         // Reset flags & Remove shares for this files
         String filePath = "";
@@ -1581,7 +1581,7 @@ public class FileDataStorageManager {
      * @return
      */
     private ArrayList<ContentProviderOperation> prepareInsertShares(
-            ArrayList<OCShare> shares, ArrayList<ContentProviderOperation> operations) {
+            List<OCShare> shares, ArrayList<ContentProviderOperation> operations) {
 
         if (shares != null) {
             // prepare operations to insert or update files to save in the given folder

+ 1 - 1
src/main/java/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski

+ 3 - 2
src/main/java/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
@@ -24,6 +24,7 @@ package com.owncloud.android.datastorage.providers;
 import com.owncloud.android.datastorage.StoragePoint;
 
 import java.io.File;
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -31,7 +32,7 @@ import java.util.Vector;
  */
 abstract class AbstractStoragePointProvider implements IStoragePointProvider {
 
-    boolean canBeAddedToAvailableList(Vector<StoragePoint> currentList, String path) {
+    boolean canBeAddedToAvailableList(List<StoragePoint> currentList, String path) {
         if (path == null) {
             return false;
         }

+ 5 - 4
src/main/java/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
@@ -25,6 +25,7 @@ import android.text.TextUtils;
 
 import com.owncloud.android.datastorage.StoragePoint;
 
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -40,15 +41,15 @@ public class EnvironmentStoragePointProvider extends AbstractStoragePointProvide
     }
 
     @Override
-    public Vector<StoragePoint> getAvailableStoragePoint() {
-        Vector<StoragePoint> result = new Vector<>();
+    public List<StoragePoint> getAvailableStoragePoint() {
+        List<StoragePoint> result = new Vector<>();
 
         addEntriesFromEnv(result, sSecondaryStorageEnvName);
 
         return result;
     }
 
-    private void addEntriesFromEnv(Vector<StoragePoint> result, String envName) {
+    private void addEntriesFromEnv(List<StoragePoint> result, String envName) {
         String env = System.getenv(envName);
         if (env != null) {
             for (String p : env.split(":")) {

+ 3 - 5
src/main/java/com/owncloud/android/datastorage/providers/IStoragePointProvider.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
@@ -23,7 +23,7 @@ package com.owncloud.android.datastorage.providers;
 
 import com.owncloud.android.datastorage.StoragePoint;
 
-import java.util.Vector;
+import java.util.List;
 
 /**
  * @author Bartosz Przybylski
@@ -38,11 +38,9 @@ public interface IStoragePointProvider {
      */
     boolean canProvideStoragePoints();
 
-
     /**
      *
      * @return available storage points
      */
-    Vector<StoragePoint> getAvailableStoragePoint();
-
+    List<StoragePoint> getAvailableStoragePoint();
 }

+ 6 - 5
src/main/java/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
@@ -23,6 +23,7 @@ package com.owncloud.android.datastorage.providers;
 
 import com.owncloud.android.datastorage.StoragePoint;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
 import java.util.regex.Pattern;
@@ -42,8 +43,8 @@ public class MountCommandStoragePointProvider extends AbstractCommandLineStorage
     }
 
     @Override
-    public Vector<StoragePoint> getAvailableStoragePoint() {
-        Vector<StoragePoint> result = new Vector<>();
+    public List<StoragePoint> getAvailableStoragePoint() {
+        List<StoragePoint> result = new Vector<>();
 
         for (String p : getPotentialPaths(getCommandLineResult())) {
             if (canBeAddedToAvailableList(result, p)) {
@@ -54,8 +55,8 @@ public class MountCommandStoragePointProvider extends AbstractCommandLineStorage
         return result;
     }
 
-    private Vector<String> getPotentialPaths(String mounted) {
-        final Vector<String> result = new Vector<>();
+    private List<String> getPotentialPaths(String mounted) {
+        final List<String> result = new Vector<>();
 
         for (String line : mounted.split("\n")) {
             if (!line.toLowerCase(Locale.US).contains("asec") && sPattern.matcher(line).matches()) {

+ 5 - 4
src/main/java/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java

@@ -24,6 +24,7 @@ package com.owncloud.android.datastorage.providers;
 import com.owncloud.android.datastorage.StoragePoint;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -38,8 +39,8 @@ public class VDCStoragePointProvider extends AbstractCommandLineStoragePoint {
 
 
     @Override
-    public Vector<StoragePoint> getAvailableStoragePoint() {
-        Vector<StoragePoint> result = new Vector<>();
+    public List<StoragePoint> getAvailableStoragePoint() {
+        List<StoragePoint> result = new Vector<>();
 
         result.addAll(getPaths(getCommandLineResult()));
 
@@ -51,8 +52,8 @@ public class VDCStoragePointProvider extends AbstractCommandLineStoragePoint {
         return sVDCVolListCommand;
     }
 
-    private Vector<StoragePoint> getPaths(String vdcResources) {
-        Vector<StoragePoint> result = new Vector<>();
+    private List<StoragePoint> getPaths(String vdcResources) {
+        List<StoragePoint> result = new Vector<>();
 
         for (String line : vdcResources.split("\n")) {
             String vdcLine[] = line.split(" ");

+ 4 - 5
src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -344,7 +344,7 @@ public class RefreshFolderOperation extends RemoteOperation {
      *
      * @param folderAndFiles Remote folder and children files in Folder
      */
-    private void synchronizeData(ArrayList<Object> folderAndFiles) {
+    private void synchronizeData(List<Object> folderAndFiles) {
         // get 'fresh data' from the database
         mLocalFolder = mStorageManager.getFileByPath(mLocalFolder.getRemotePath());
 
@@ -397,10 +397,9 @@ public class RefreshFolderOperation extends RemoteOperation {
 
             // prepare content synchronization for kept-in-sync files
             if (updatedFile.isAvailableOffline()) {
-                SynchronizeFileOperation operation = new SynchronizeFileOperation(localFile, remoteFile, mAccount, true,
-                        mContext);
-
-                mFilesToSyncContents.add(operation);
+                mFilesToSyncContents.add(
+                        new SynchronizeFileOperation(localFile, remoteFile, mAccount, true, mContext)
+                );
             }
 
             // update file name for encrypted files

+ 10 - 10
src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author David A. Velasco
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 package com.owncloud.android.providers;
 
 import android.accounts.Account;
@@ -32,6 +31,7 @@ import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.BaseColumns;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.widget.Toast;
 
@@ -52,6 +52,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 
 /**
@@ -84,7 +85,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     private UriMatcher mUriMatcher;
 
-    private static HashMap<String, ShareType> sShareTypes = new HashMap<>();
+    private static Map<String, ShareType> sShareTypes = new HashMap<>();
 
     public static ShareType getShareType(String authority) {
 
@@ -93,7 +94,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     @Nullable
     @Override
-    public String getType(Uri uri) {
+    public String getType(@NonNull Uri uri) {
         // TODO implement
         return null;
     }
@@ -119,7 +120,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     /**
      * TODO description
-     * <p/>
+     *
      * Reference: http://developer.android.com/guide/topics/search/adding-custom-suggestions.html#CustomContentProvider
      *
      * @param uri           Content {@link Uri}, formattted as
@@ -133,7 +134,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
      */
     @Nullable
     @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+    public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
         Log_OC.d(TAG, "query received in thread " + Thread.currentThread().getName());
 
         int match = mUriMatcher.match(uri);
@@ -240,19 +241,19 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     @Nullable
     @Override
-    public Uri insert(Uri uri, ContentValues values) {
+    public Uri insert(@NonNull Uri uri, ContentValues values) {
         // TODO implementation
         return null;
     }
 
     @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
+    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
         // TODO implementation
         return 0;
     }
 
     @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         // TODO implementation
         return 0;
     }
@@ -283,5 +284,4 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
             }
         });
     }
-
 }

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -663,7 +663,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
      *
      * @param accounts list of accounts
      */
-    private void repopulateAccountList(ArrayList<Account> accounts) {
+    private void repopulateAccountList(List<Account> accounts) {
         // remove all accounts from list
         mNavigationView.getMenu().removeGroup(R.id.drawer_menu_accounts);
 

+ 2 - 2
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -315,9 +315,9 @@ public class ReceiveExternalFilesActivity extends FileActivity
          *
          * @return list of account list items
          */
-        private ArrayList<AccountListItem> getAccountListItems(ReceiveExternalFilesActivity activity) {
+        private List<AccountListItem> getAccountListItems(ReceiveExternalFilesActivity activity) {
             Account[] accountList = activity.mAccountManager.getAccountsByType(MainApp.getAccountType(getActivity()));
-            ArrayList<AccountListItem> adapterAccountList = new ArrayList<>(accountList.length);
+            List<AccountListItem> adapterAccountList = new ArrayList<>(accountList.length);
             for (Account account : accountList) {
                 adapterAccountList.add(new AccountListItem(account));
             }

+ 3 - 3
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -117,6 +117,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -180,7 +181,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     private MenuItemAddRemove menuItemAddRemoveValue = MenuItemAddRemove.DO_NOTHING;
 
-    private ArrayList<MenuItem> mOriginalMenuItems = new ArrayList<>();
+    private List<MenuItem> mOriginalMenuItems = new ArrayList<>();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -439,7 +440,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
         /**
          * Selected items in list when action mode is closed by drawer
          */
-        private HashSet<OCFile> mSelectionWhenActionModeClosedByDrawer = new HashSet<>();
+        private Set<OCFile> mSelectionWhenActionModeClosedByDrawer = new HashSet<>();
 
         @Override
         public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
@@ -487,7 +488,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
             }
         }
 
-
         /**
          * Update action mode bar when an item is selected / unselected in the list
          */

+ 5 - 5
src/main/java/com/owncloud/android/utils/EncryptionUtils.java

@@ -69,6 +69,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.crypto.BadPaddingException;
@@ -86,7 +87,6 @@ import javax.crypto.spec.SecretKeySpec;
 /**
  * Utils for encryption
  */
-
 public final class EncryptionUtils {
     private static String TAG = EncryptionUtils.class.getSimpleName();
 
@@ -95,8 +95,8 @@ public final class EncryptionUtils {
     public static final String MNEMONIC = "MNEMONIC";
     public static final int ivLength = 16;
     public static final int saltLength = 40;
-    public static final String HASH_DELIMITER = "$";
 
+    private static final String HASH_DELIMITER = "$";
     private static final String ivDelimiter = "fA=="; // "|" base64 encoded
     private static final int iterationCount = 1024;
     private static final int keyStrength = 256;
@@ -590,7 +590,7 @@ public final class EncryptionUtils {
         return "";
     }
 
-    public static ArrayList<String> getRandomWords(int count, Context context) throws IOException {
+    public static List<String> getRandomWords(int count, Context context) throws IOException {
         InputStream ins = context.getResources().openRawResource(context.getResources()
                 .getIdentifier("encryption_key_words", "raw", context.getPackageName()));
 
@@ -598,7 +598,7 @@ public final class EncryptionUtils {
 
         BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
 
-        ArrayList<String> lines = new ArrayList<>();
+        List<String> lines = new ArrayList<>();
         String line;
         while ((line = bufferedReader.readLine()) != null) {
             lines.add(line);
@@ -606,7 +606,7 @@ public final class EncryptionUtils {
 
         SecureRandom random = new SecureRandom();
 
-        ArrayList<String> outputLines = new ArrayList<>();
+        List<String> outputLines = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             int randomLine = random.nextInt(lines.size());
             outputLines.add(lines.get(randomLine));