codacy: Avoid using implementation types; use the interface instead

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

@@ -29,12 +29,11 @@ import android.net.Uri;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Database provider for handling the persistence aspects of arbitrary data table.
  */
-
 public class ArbitraryDataProvider {
     static private final String TAG = ArbitraryDataProvider.class.getSimpleName();
 
@@ -56,7 +55,7 @@ public class ArbitraryDataProvider {
         );
     }
 
-    public int deleteForKeyWhereAccountNotIn(ArrayList<String> accounts, String key) {
+    public int deleteForKeyWhereAccountNotIn(List<String> accounts, String key) {
         return contentResolver.delete(
                 ProviderMeta.ProviderTableMeta.CONTENT_URI_ARBITRARY_DATA,
                 ProviderMeta.ProviderTableMeta.ARBITRARY_DATA_CLOUD_ID + " NOT IN (?) AND " +

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

@@ -22,14 +22,14 @@
 package com.owncloud.android.datamodel;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Decrypted class representation of metadata json of folder metadata
  */
-
 public class DecryptedFolderMetadata {
     private Metadata metadata;
-    private HashMap<String, DecryptedFile> files;
+    private Map<String, DecryptedFile> files;
 
     public DecryptedFolderMetadata() {
         this.metadata = new Metadata();
@@ -49,24 +49,24 @@ public class DecryptedFolderMetadata {
         this.metadata = metadata;
     }
 
-    public HashMap<String, DecryptedFile> getFiles() {
+    public Map<String, DecryptedFile> getFiles() {
         return files;
     }
 
-    public void setFiles(HashMap<String, DecryptedFile> files) {
+    public void setFiles(Map<String, DecryptedFile> files) {
         this.files = files;
     }
 
     public static class Metadata {
-        private HashMap<Integer, String> metadataKeys; // each keys is encrypted on its own, decrypt on use
+        private Map<Integer, String> metadataKeys; // each keys is encrypted on its own, decrypt on use
         private Sharing sharing;
         private int version;
 
-        public HashMap<Integer, String> getMetadataKeys() {
+        public Map<Integer, String> getMetadataKeys() {
             return metadataKeys;
         }
 
-        public void setMetadataKeys(HashMap<Integer, String> metadataKeys) {
+        public void setMetadataKeys(Map<Integer, String> metadataKeys) {
             this.metadataKeys = metadataKeys;
         }
 
@@ -93,26 +93,26 @@ public class DecryptedFolderMetadata {
     }
 
     public static class Encrypted {
-        private HashMap<Integer, String> metadataKeys;
+        private Map<Integer, String> metadataKeys;
 
-        public HashMap<Integer, String> getMetadataKeys() {
+        public Map<Integer, String> getMetadataKeys() {
             return metadataKeys;
         }
 
-        public void setMetadataKeys(HashMap<Integer, String> metadataKeys) {
+        public void setMetadataKeys(Map<Integer, String> metadataKeys) {
             this.metadataKeys = metadataKeys;
         }
     }
 
     public static class Sharing {
-        private HashMap<String, String> recipient;
+        private Map<String, String> recipient;
         private String signature;
 
-        public HashMap<String, String> getRecipient() {
+        public Map<String, String> getRecipient() {
             return recipient;
         }
 
-        public void setRecipient(HashMap<String, String> recipient) {
+        public void setRecipient(Map<String, String> recipient) {
             this.recipient = recipient;
         }
 

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

@@ -21,7 +21,7 @@
 
 package com.owncloud.android.datamodel;
 
-import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Encrypted class representation of metadata json of folder metadata
@@ -29,9 +29,9 @@ import java.util.HashMap;
 
 public class EncryptedFolderMetadata {
     private DecryptedFolderMetadata.Metadata metadata;
-    private HashMap<String, EncryptedFile> files;
+    private Map<String, EncryptedFile> files;
     
-    public EncryptedFolderMetadata(DecryptedFolderMetadata.Metadata metadata, HashMap<String, EncryptedFile> files) {
+    public EncryptedFolderMetadata(DecryptedFolderMetadata.Metadata metadata, Map<String, EncryptedFile> files) {
         this.metadata = metadata;
         this.files = files;
     }
@@ -44,11 +44,11 @@ public class EncryptedFolderMetadata {
         this.metadata = metadata;
     }
 
-    public HashMap<String, EncryptedFile> getFiles() {
+    public Map<String, EncryptedFile> getFiles() {
         return files;
     }
 
-    public void setFiles(HashMap<String, EncryptedFile> files) {
+    public void setFiles(Map<String, EncryptedFile> files) {
         this.files = files;
     }
 
@@ -91,4 +91,3 @@ public class EncryptedFolderMetadata {
         }
     }
 }
-

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

@@ -31,6 +31,7 @@ import com.owncloud.android.lib.common.ExternalLinkType;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Database provider for handling the persistence aspects of {@link com.owncloud.android.lib.common.ExternalLink}s.
@@ -82,7 +83,7 @@ public class ExternalLinksProvider {
      *
      * @return external links, empty if none exists
      */
-    public ArrayList<ExternalLink> getExternalLink(ExternalLinkType type) {
+    public List<ExternalLink> getExternalLink(ExternalLinkType type) {
         Cursor cursor = mContentResolver.query(
                 ProviderMeta.ProviderTableMeta.CONTENT_URI_EXTERNAL_LINKS,
                 null,
@@ -92,7 +93,7 @@ public class ExternalLinksProvider {
         );
 
         if (cursor != null) {
-            ArrayList<ExternalLink> list = new ArrayList<>();
+            List<ExternalLink> list = new ArrayList<>();
             if (cursor.moveToFirst()) {
                 do {
                     ExternalLink externalLink = createExternalLinkFromCursor(cursor);

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

@@ -1656,7 +1656,7 @@ public class FileDataStorageManager {
 
     }
 
-    public ArrayList<OCShare> getSharesWithForAFile(String filePath, String accountName) {
+    public List<OCShare> getSharesWithForAFile(String filePath, String accountName) {
         // Condition
         String where = ProviderTableMeta.OCSHARES_PATH + AND
                 + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + AND

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

@@ -309,7 +309,7 @@ public class SyncedFolderProvider extends Observable {
      * @param ids     the list of ids to be excluded from deletion.
      * @return number of deleted records.
      */
-    public int deleteSyncedFoldersNotInList(Context context, ArrayList<Long> ids) {
+    public int deleteSyncedFoldersNotInList(Context context, List<Long> ids) {
         int result = mContentResolver.delete(
                 ProviderMeta.ProviderTableMeta.CONTENT_URI_SYNCED_FOLDERS,
                 ProviderMeta.ProviderTableMeta._ID + " NOT IN (?)",

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

@@ -71,7 +71,7 @@ import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.net.URLEncoder;
-import java.util.ArrayList;
+import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -379,7 +379,7 @@ public class ThumbnailsCacheManager {
     public static class ThumbnailGenerationTask extends AsyncTask<ThumbnailGenerationTaskObject, Void, Bitmap> {
         private final WeakReference<ImageView> mImageViewReference;
         private static Account mAccount;
-        private ArrayList<ThumbnailGenerationTask> mAsyncTasks = null;
+        private List<ThumbnailGenerationTask> mAsyncTasks;
         private Object mFile;
         private String mImageKey = null;
         private FileDataStorageManager mStorageManager;
@@ -391,7 +391,7 @@ public class ThumbnailsCacheManager {
         }
 
         public ThumbnailGenerationTask(ImageView imageView, FileDataStorageManager storageManager,
-                                       Account account, ArrayList<ThumbnailGenerationTask> asyncTasks)
+                                       Account account, List<ThumbnailGenerationTask> asyncTasks)
                 throws IllegalArgumentException {
             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<ImageView>(imageView);

src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java

@@ -42,7 +42,7 @@ import java.util.Vector;
  */
 public class DataStorageProvider {
 
-    private static final Vector<IStoragePointProvider> mStorageProviders = new Vector<>();
+    private static final List<IStoragePointProvider> mStorageProviders = new ArrayList<>();
     private static final UniqueStorageList mCachedStoragePoints = new UniqueStorageList();
     private static final DataStorageProvider sInstance = new DataStorageProvider() {{
         // There is no system wide way to get usb storage so we need to provide multiple

src/main/java/com/owncloud/android/features/FeatureList.java

@@ -44,8 +44,8 @@ public class FeatureList {
     private static final int VERSION_3_3_0 = 30030099;
     private static final int BETA_VERSION_0 = 0;
 
-    static public ArrayList<FeatureItem> get(boolean isMultiAccount) {
-        ArrayList<FeatureItem> featuresList = new ArrayList<>();
+    static public List<FeatureItem> get(boolean isMultiAccount) {
+        List<FeatureItem> featuresList = new ArrayList<>();
         // Basic features showed on first install
         featuresList.add(new FeatureItem(R.drawable.whats_new_files,
                 R.string.welcome_feature_1_title, R.string.welcome_feature_1_text,

src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -42,7 +42,6 @@ import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -261,7 +260,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
      *
      * @param folderAndFiles Remote folder and children files in Folder
      */
-    private void synchronizeData(ArrayList<Object> folderAndFiles) throws OperationCancelledException {
+    private void synchronizeData(List<Object> folderAndFiles) throws OperationCancelledException {
         FileDataStorageManager storageManager = getStorageManager();
         
         // parse data from remote folder

src/main/java/com/owncloud/android/operations/UnshareOperation.java

@@ -34,7 +34,7 @@ import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
 import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.operations.common.SyncOperation;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Unshare file/folder
@@ -80,7 +80,7 @@ public class UnshareOperation extends SyncOperation {
                 } else if (ShareType.USER.equals(mShareType) || ShareType.GROUP.equals(mShareType)
                     || ShareType.FEDERATED.equals(mShareType)){
                     // Check if it is the last share
-                    ArrayList <OCShare> sharesWith = getStorageManager().
+                    List <OCShare> sharesWith = getStorageManager().
                             getSharesWithForAFile(mRemotePath,
                             getStorageManager().getAccount().name);
                     if (sharesWith.size() == 1) {

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

@@ -57,7 +57,9 @@ import org.nextcloud.providers.cursors.RootCursor;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
@@ -291,8 +293,8 @@ public class DocumentsStorageProvider extends DocumentsProvider {
         return !(cancellationSignal != null && cancellationSignal.isCanceled());
     }
 
-    Vector<OCFile> findFiles(OCFile root, String query) {
-        Vector<OCFile> result = new Vector<>();
+    List<OCFile> findFiles(OCFile root, String query) {
+        List<OCFile> result = new ArrayList<>();
         for (OCFile f : mCurrentStorageManager.getFolderContent(root, false)) {
             if (f.isFolder()) {
                 result.addAll(findFiles(f, query));

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

@@ -99,6 +99,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Base class to handle setup of the drawer implementation including user switching and avatar fetching and fallback
@@ -824,7 +825,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
     private void updateQuotaLink() {
         if (mQuotaTextLink != null) {
             if (getBaseContext().getResources().getBoolean(R.bool.show_external_links)) {
-                ArrayList<ExternalLink> quotas = externalLinksProvider.getExternalLink(ExternalLinkType.QUOTA);
+                List<ExternalLink> quotas = externalLinksProvider.getExternalLink(ExternalLinkType.QUOTA);
 
                 float density = getResources().getDisplayMetrics().density;
                 final int size = Math.round(24 * density);

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

@@ -48,7 +48,7 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -75,8 +75,8 @@ public class ErrorsWhileCopyingHandlerActivity  extends AppCompatActivity implem
     
     protected Account mAccount;
     protected FileDataStorageManager mStorageManager;
-    protected ArrayList<String> mLocalPaths;
-    protected ArrayList<String> mRemotePaths;
+    protected List<String> mLocalPaths;
+    protected List<String> mRemotePaths;
     protected ArrayAdapter<String> mAdapter;
     protected Handler mHandler;
     private DialogFragment mCurrentDialog;

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

@@ -65,6 +65,7 @@ import org.parceler.Parcels;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -238,9 +239,9 @@ public class ManageAccountsActivity extends FileActivity
      *
      * @return list of account list items
      */
-    private ArrayList<AccountListItem> getAccountListItems() {
+    private List<AccountListItem> getAccountListItems() {
         Account[] accountList = AccountManager.get(this).getAccountsByType(MainApp.getAccountType(this));
-        ArrayList<AccountListItem> adapterAccountList = new ArrayList<>(accountList.length);
+        List<AccountListItem> adapterAccountList = new ArrayList<>(accountList.length);
         for (Account account : accountList) {
             boolean pendingForRemoval = arbitraryDataProvider.getBooleanValue(account, PENDING_FOR_REMOVAL);
             adapterAccountList.add(new AccountListItem(account, !pendingForRemoval));
@@ -308,7 +309,7 @@ public class ManageAccountsActivity extends FileActivity
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAccountRemovedEvent(AccountRemovedEvent event) {
-        ArrayList<AccountListItem> accountListItemArray = getAccountListItems();
+        List<AccountListItem> accountListItemArray = getAccountListItems();
         mAccountListAdapter.clear();
         mAccountListAdapter.addAll(accountListItemArray);
         mAccountListAdapter.notifyDataSetChanged();
@@ -338,7 +339,7 @@ public class ManageAccountsActivity extends FileActivity
                 AccountUtils.setCurrentOwnCloudAccount(this, accountName);
             }
 
-            ArrayList<AccountListItem> accountListItemArray = getAccountListItems();
+            List<AccountListItem> accountListItemArray = getAccountListItems();
             if (accountListItemArray.size() > 1) {
                 mAccountListAdapter = new AccountListAdapter(this, accountListItemArray, mTintedCheck);
                 mListView.setAdapter(mAccountListAdapter);

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

@@ -134,7 +134,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
     private AccountManager mAccountManager;
     private Stack<String> mParents = new Stack<>();
-    private ArrayList<Parcelable> mStreamsToUpload;
+    private List<Parcelable> mStreamsToUpload;
     private String mUploadPath;
     private OCFile mFile;
 

src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java

@@ -19,9 +19,9 @@ import com.owncloud.android.ui.interfaces.ActivityListInterface;
 import com.owncloud.android.ui.interfaces.VersionListInterface;
 import com.owncloud.android.utils.DisplayUtils;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -39,7 +39,7 @@ public class ActivityAndVersionListAdapter extends ActivityListAdapter {
         this.versionListInterface = versionListInterface;
     }
 
-    public void setActivityAndVersionItems(ArrayList<Object> items, OwnCloudClient newClient, boolean clear) {
+    public void setActivityAndVersionItems(List<Object> items, OwnCloudClient newClient, boolean clear) {
         if (client == null) {
             client = newClient;
         }

src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -330,7 +330,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         return ssb;
     }
 
-    private RichObject searchObjectByName(ArrayList<RichObject> richObjectList, String name) {
+    private RichObject searchObjectByName(List<RichObject> richObjectList, String name) {
         for (RichObject richObject : richObjectList) {
             if (richObject.getTag().equalsIgnoreCase(name))
                 return richObject;

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -75,6 +75,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.Vector;
 
 /**
@@ -92,7 +93,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private boolean mHideItemOptions;
     private boolean gridView;
     private boolean multiSelect;
-    private HashSet<OCFile> checkedFiles;
+    private Set<OCFile> checkedFiles;
 
     private FileDataStorageManager mStorageManager;
     private Account mAccount;
@@ -106,7 +107,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private static final int VIEWTYPE_ITEM = 1;
     private static final int VIEWTYPE_IMAGE = 2;
 
-    private ArrayList<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
+    private List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
 
     public OCFileListAdapter(Context context, ComponentsGetter transferServiceGetter,
                              OCFileListFragmentInterface ocFileListFragmentInterface, boolean argHideItemOptions,
@@ -532,7 +533,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
     }
 
-    public void setData(ArrayList<Object> objects, ExtendedListFragment.SearchType searchType,
+    public void setData(List<Object> objects, ExtendedListFragment.SearchType searchType,
                         FileDataStorageManager storageManager, OCFile folder) {
         if (storageManager != null && mStorageManager == null) {
             mStorageManager = storageManager;
@@ -569,7 +570,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         });
     }
 
-    private void parseShares(ArrayList<Object> objects) {
+    private void parseShares(List<Object> objects) {
         List<OCShare> shares = new ArrayList<>();
 
         for (Object shareObject : objects) {
@@ -608,7 +609,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         mStorageManager.saveShares(shares);
     }
 
-    private void parseVirtuals(ArrayList<Object> objects, ExtendedListFragment.SearchType searchType) {
+    private void parseVirtuals(List<Object> objects, ExtendedListFragment.SearchType searchType) {
         VirtualFolderType type;
         boolean onlyImages = false;
         switch (searchType) {
@@ -666,7 +667,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
      * @param files Collection of files to filter
      * @return Folders in the input
      */
-    public List<OCFile> getFolders(ArrayList<OCFile> files) {
+    public List<OCFile> getFolders(List<OCFile> files) {
         List<OCFile> ret = new ArrayList<>();
 
         for (OCFile file : files) {
@@ -685,11 +686,11 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         notifyDataSetChanged();
     }
 
-    public HashSet<OCFile> getCheckedItems() {
+    public Set<OCFile> getCheckedItems() {
         return checkedFiles;
     }
 
-    public void setCheckedItem(HashSet<OCFile> files) {
+    public void setCheckedItem(Set<OCFile> files) {
         checkedFiles.clear();
         checkedFiles.addAll(files);
     }

src/main/java/com/owncloud/android/ui/adapter/ShareUserListAdapter.java

@@ -35,7 +35,7 @@ import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.ui.TextDrawable;
 
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Adapter to show a user/group in Share With List
@@ -43,11 +43,11 @@ import java.util.ArrayList;
 public class ShareUserListAdapter extends ArrayAdapter {
 
     private Context mContext;
-    private ArrayList<OCShare> mShares;
+    private List<OCShare> mShares;
     private ShareUserAdapterListener mListener;
     private float mAvatarRadiusDimension;
 
-    public ShareUserListAdapter(Context context, int resource, ArrayList<OCShare>shares,
+    public ShareUserListAdapter(Context context, int resource, List<OCShare> shares,
                                 ShareUserAdapterListener listener) {
         super(context, resource);
         mContext= context;

src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java

@@ -67,7 +67,7 @@ public class TrashbinListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     private Account account;
     private FileDataStorageManager storageManager;
 
-    private ArrayList<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
+    private List<ThumbnailsCacheManager.ThumbnailGenerationTask> asyncTasks = new ArrayList<>();
 
     public TrashbinListAdapter(TrashbinActivityInterface trashbinActivityInterface,
                                FileDataStorageManager storageManager, Context context) {

src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java

@@ -55,7 +55,7 @@ import com.owncloud.android.utils.ThemeUtils;
 import java.io.IOException;
 import java.security.KeyPair;
 import java.security.PrivateKey;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 /*
@@ -86,7 +86,7 @@ public class SetupEncryptionDialogFragment extends DialogFragment {
     private DownloadKeysAsyncTask task;
     private TextView passwordField;
     private String keyResult;
-    private ArrayList<String> keyWords;
+    private List<String> keyWords;
 
     /**
      * Public factory method to create new SetupEncryptionDialogFragment instance

src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java

@@ -71,6 +71,7 @@ import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.BindString;
 import butterknife.BindView;
@@ -307,8 +308,8 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
                 }
 
                 if (result.isSuccess() && result.getData() != null) {
-                    final ArrayList<Object> data = result.getData();
-                    final ArrayList<Object> activitiesAndVersions = (ArrayList) data.get(0);
+                    final List<Object> data = result.getData();
+                    final List<Object> activitiesAndVersions = (ArrayList) data.get(0);
 
                     if (restoreFileVersionSupported && versions != null) {
                         activitiesAndVersions.addAll(versions);
@@ -351,7 +352,7 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
         t.start();
     }
 
-    private void populateList(ArrayList<Object> activities, boolean clear) {
+    private void populateList(List<Object> activities, boolean clear) {
         adapter.setActivityAndVersionItems(activities, ownCloudClient, clear);
     }
 

src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -63,7 +63,7 @@ import com.owncloud.android.ui.fragment.util.SharingMenuHelper;
 import com.owncloud.android.utils.ClipboardUtil;
 import com.owncloud.android.utils.ThemeUtils;
 
-import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -76,7 +76,7 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
     private static final String ARG_ACCOUNT = "ACCOUNT";
 
     // to show share with users/groups info
-    private ArrayList<OCShare> shares;
+    private List<OCShare> shares;
 
     private OCFile file;
     private Account account;

src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java

@@ -43,7 +43,7 @@ import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Fragment for Searching sharees (users and groups)
@@ -69,7 +69,7 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
     private Account mAccount;
 
     // other members
-    private ArrayList<OCShare> mShares;
+    private List<OCShare> mShares;
     private ShareFragmentListener mListener;
 
 

src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -62,7 +62,7 @@ import com.owncloud.android.utils.MimeTypeUtil;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Date;
 
 /**
@@ -109,7 +109,7 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
     /**
      * List of private shares bound to the file.
      */
-    private ArrayList<OCShare> mPrivateShares;
+    private List<OCShare> mPrivateShares;
 
     /**
      * Capabilities of the server.

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

@@ -139,7 +139,7 @@ public class ContactListFragment extends FileFragment {
 
     private ContactListAdapter contactListAdapter;
     private Account account;
-    private ArrayList<VCard> vCards = new ArrayList<>();
+    private List<VCard> vCards = new ArrayList<>();
     private OCFile ocFile;
 
     public static ContactListFragment newInstance(OCFile file, Account account) {

src/main/java/com/owncloud/android/ui/helpers/UriUploader.java

@@ -52,7 +52,7 @@ public class UriUploader {
     private final String TAG = UriUploader.class.getSimpleName();
 
     private FileActivity mActivity;
-    private ArrayList<Parcelable> mUrisToUpload;
+    private List<Parcelable> mUrisToUpload;
     private CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener mCopyTmpTaskListener;
 
     private int mBehaviour;
@@ -72,7 +72,7 @@ public class UriUploader {
 
     public UriUploader(
             FileActivity activity,
-            ArrayList<Parcelable> uris,
+            List<Parcelable> uris,
             String uploadPath,
             Account account,
             int behaviour,