浏览代码

use List as type instead of ArrayList

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 7 年之前
父节点
当前提交
c05243b0d3

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

@@ -150,7 +150,7 @@ public class FileDataStorageManager {
     }
 
 
-    public ArrayList<OCFile> getFolderContent(OCFile f, boolean onlyOnDevice) {
+    public List<OCFile> getFolderContent(OCFile f, boolean onlyOnDevice) {
         if (f != null && f.isFolder() && f.getFileId() != -1) {
             return getFolderContent(f.getFileId(), onlyOnDevice);
         } else {
@@ -159,12 +159,12 @@ public class FileDataStorageManager {
     }
 
 
-    public ArrayList<OCFile> getFolderImages(OCFile folder, boolean onlyOnDevice) {
-        ArrayList<OCFile> ret = new ArrayList<>();
+    public List<OCFile> getFolderImages(OCFile folder, boolean onlyOnDevice) {
+        List<OCFile> ret = new ArrayList<>();
         
         if (folder != null) {
             // TODO better implementation, filtering in the access to database instead of here
-            ArrayList<OCFile> tmp = getFolderContent(folder, onlyOnDevice);
+            List<OCFile> tmp = getFolderContent(folder, onlyOnDevice);
 
             for (OCFile file : tmp) {
                 if (MimeTypeUtil.isImage(file)) {
@@ -569,7 +569,7 @@ public class FileDataStorageManager {
         File localFolder = new File(localFolderPath);
         if (localFolder.exists()) {
             // stage 1: remove the local files already registered in the files database
-            ArrayList<OCFile> files = getFolderContent(folder.getFileId(), false);
+            List<OCFile> files = getFolderContent(folder.getFileId(), false);
             if (files != null) {
                 for (OCFile file : files) {
                     if (file.isFolder()) {
@@ -808,9 +808,9 @@ public class FileDataStorageManager {
         }
     }
 
-    private ArrayList<OCFile> getFolderContent(long parentId, boolean onlyOnDevice) {
+    private List<OCFile> getFolderContent(long parentId, boolean onlyOnDevice) {
 
-        ArrayList<OCFile> ret = new ArrayList<>();
+        List<OCFile> ret = new ArrayList<>();
 
         Uri req_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(parentId));
         Cursor c;
@@ -1608,7 +1608,7 @@ public class FileDataStorageManager {
                     + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
             String[] whereArgs = new String[]{"", mAccount.name};
 
-            ArrayList<OCFile> files = getFolderContent(folder, false);
+            List<OCFile> files = getFolderContent(folder, false);
 
             for (OCFile file : files) {
                 whereArgs[0] = file.getRemotePath();
@@ -2133,8 +2133,8 @@ public class FileDataStorageManager {
         }
     }
 
-    public ArrayList<OCFile> getVirtualFolderContent(VirtualFolderType type, boolean onlyImages) {
-        ArrayList<OCFile> ocFiles = new ArrayList<>();
+    public List<OCFile> getVirtualFolderContent(VirtualFolderType type, boolean onlyImages) {
+        List<OCFile> ocFiles = new ArrayList<>();
         Uri req_uri = ProviderTableMeta.CONTENT_URI_VIRTUAL;
         Cursor c;
 
@@ -2173,7 +2173,7 @@ public class FileDataStorageManager {
         }
 
         if (onlyImages) {
-            ArrayList<OCFile> temp = new ArrayList<>();
+            List<OCFile> temp = new ArrayList<>();
 
             for (OCFile file : temp) {
                 if (MimeTypeUtil.isImage(file)) {

+ 2 - 1
src/main/java/com/owncloud/android/jobs/ContactsBackupJob.java

@@ -54,6 +54,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 
 /**
  * Job that backup contacts to /Contacts-Backup and deletes files older than x days
@@ -183,7 +184,7 @@ public class ContactsBackupJob extends Job {
                 Log_OC.d(TAG, "expire: " + daysToExpire + " " + backupFolder.getFileName());
             }
 
-            ArrayList<OCFile> backups = storageManager.getFolderContent(backupFolder, false);
+            List<OCFile> backups = storageManager.getFolderContent(backupFolder, false);
 
             for (OCFile backup : backups) {
                 if (timestampToExpire > backup.getModificationTimestamp()) {

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

@@ -628,7 +628,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         // click on folder in the list
         Log_OC.d(TAG, "on item click");
-        ArrayList<OCFile> tmpFiles = getStorageManager().getFolderContent(mFile, false);
+        List<OCFile> tmpFiles = getStorageManager().getFolderContent(mFile, false);
         tmpFiles = sortFileList(tmpFiles);
 
         if (tmpFiles.size() <= 0) {
@@ -738,7 +738,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
         mFile = getStorageManager().getFileByPath(full_path);
         if (mFile != null) {
-            ArrayList<OCFile> files = getStorageManager().getFolderContent(mFile, false);
+            List<OCFile> files = getStorageManager().getFolderContent(mFile, false);
 
             if (files.size() == 0) {
                 setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
@@ -834,7 +834,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
         syncFolderOp.execute(getAccount(), this, null, null);
     }
 
-    private ArrayList<OCFile> sortFileList(ArrayList<OCFile> files) {
+    private List<OCFile> sortFileList(List<OCFile> files) {
         FileSortOrder sortOrder = getSortOrder(this, mFile);
         return sortOrder.sortCloudFiles(files);
     }

+ 9 - 8
src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java

@@ -51,6 +51,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -63,8 +64,8 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private static final int showFilenameColumnThreshold = 4;
     private Context mContext;
-    private ArrayList<File> mFiles = new ArrayList<>();
-    private ArrayList<File> mFilesAll = new ArrayList<>();
+    private List<File> mFiles = new ArrayList<>();
+    private List<File> mFilesAll = new ArrayList<>();
     private boolean mLocalFolderPicker;
     private boolean gridView = false;
     private LocalFileListFragmentInterface localFileListFragmentInterface;
@@ -142,7 +143,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     public String[] getCheckedFilesPath() {
-        ArrayList<String> result = new ArrayList<>();
+        List<String> result = new ArrayList<>();
 
         for (File file : checkedFiles) {
             result.add(file.getAbsolutePath());
@@ -421,7 +422,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
         notifyDataSetChanged();
     }
 
-    private ArrayList<File> getFolders(final File directory) {
+    private List<File> getFolders(final File directory) {
         File[] folders = directory.listFiles(File::isFile);
 
         if (folders != null && folders.length > 0) {
@@ -431,7 +432,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
         }
     }
 
-    private ArrayList<File> getFiles(File directory) {
+    private List<File> getFiles(File directory) {
         File[] files = directory.listFiles();
 
         if (files != null && files.length > 0) {
@@ -445,7 +446,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
         if (text.isEmpty()) {
             mFiles = mFilesAll;
         } else {
-            ArrayList<File> result = new ArrayList<>();
+            List<File> result = new ArrayList<>();
             text = text.toLowerCase(Locale.getDefault());
             for (File file : mFilesAll) {
                 if (file.getName().toLowerCase(Locale.getDefault()).contains(text)) {
@@ -463,8 +464,8 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
      * @param files ArrayList of files to filter
      * @return Non-hidden files
      */
-    public ArrayList<File> filterHiddenFiles(ArrayList<File> files) {
-        ArrayList<File> ret = new ArrayList<>();
+    public List<File> filterHiddenFiles(List<File> files) {
+        List<File> ret = new ArrayList<>();
 
         for (File file : files) {
             if (!file.isHidden()) {

+ 10 - 9
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -70,6 +70,7 @@ import com.owncloud.android.utils.ThemeUtils;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Vector;
 
@@ -83,8 +84,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private final FileUploader.FileUploaderBinder uploaderBinder;
     private final OperationsService.OperationsServiceBinder operationsServiceBinder;
     private Context mContext;
-    private ArrayList<OCFile> mFiles = new ArrayList<>();
-    private ArrayList<OCFile> mFilesAll = new ArrayList<>();
+    private List<OCFile> mFiles = new ArrayList<>();
+    private List<OCFile> mFilesAll = new ArrayList<>();
     private boolean mHideItemOptions;
     private boolean gridView = false;
     private boolean multiSelect = false;
@@ -540,7 +541,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     }
 
     private void parseShares(ArrayList<Object> objects) {
-        ArrayList<OCShare> shares = new ArrayList<>();
+        List<OCShare> shares = new ArrayList<>();
         for (int i = 0; i < objects.size(); i++) {
             // check type before cast as of long running data fetch it is possible that old result is filled
             if (objects.get(i) instanceof OCShare) {
@@ -595,7 +596,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
         mStorageManager.deleteVirtuals(type);
 
-        ArrayList<ContentValues> contentValues = new ArrayList<>();
+        List<ContentValues> contentValues = new ArrayList<>();
 
         for (int i = 0; i < objects.size(); i++) {
             OCFile ocFile = FileStorageUtils.fillOCFile((RemoteFile) objects.get(i));
@@ -627,8 +628,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
      * @param files Collection of files to filter
      * @return Folders in the input
      */
-    public ArrayList<OCFile> getFolders(ArrayList<OCFile> files) {
-        ArrayList<OCFile> ret = new ArrayList<>();
+    public List<OCFile> getFolders(ArrayList<OCFile> files) {
+        List<OCFile> ret = new ArrayList<>();
 
         for (OCFile file : files) {
             if (file.isFolder()) {
@@ -659,7 +660,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         checkedFiles.clear();
     }
 
-    public ArrayList<OCFile> getFiles() {
+    public List<OCFile> getFiles() {
         return mFiles;
     }
 
@@ -719,8 +720,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
      * @param files Collection of files to filter
      * @return Non-hidden files
      */
-    public ArrayList<OCFile> filterHiddenFiles(ArrayList<OCFile> files) {
-        ArrayList<OCFile> ret = new ArrayList<>();
+    public List<OCFile> filterHiddenFiles(List<OCFile> files) {
+        List<OCFile> ret = new ArrayList<>();
 
         for (OCFile file : files) {
             if (!file.isHidden() && !ret.contains(file)) {

+ 2 - 1
src/main/java/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java

@@ -36,6 +36,7 @@ import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
@@ -112,7 +113,7 @@ implements ConfirmationDialogFragmentListener {
         
         boolean containsFavorite = false;
         if (mTargetFile.isFolder()) {
-            ArrayList<OCFile> files = storageManager.getFolderContent(mTargetFile, false);
+            List<OCFile> files = storageManager.getFolderContent(mTargetFile, false);
             
             for(OCFile file: files) {
                 containsFavorite = file.isAvailableOffline() || containsFavorite;

+ 4 - 4
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -59,11 +59,11 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.PermissionUtil;
 import com.owncloud.android.utils.ThemeUtils;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -223,7 +223,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
                 if (result) {
                     OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderPath);
 
-                    ArrayList<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager()
+                    List<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager()
                             .getFolderContent(backupFolder, false);
 
                     if (backupFiles == null || backupFiles.size() == 0) {
@@ -387,7 +387,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
         String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
         OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString);
 
-        ArrayList<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(backupFolder,
+        List<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(backupFolder,
                 false);
 
         Collections.sort(backupFiles, new Comparator<OCFile>() {
@@ -469,7 +469,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
 
         String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
         OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString);
-        ArrayList<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(
+        List<OCFile> backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(
                 backupFolder, false);
 
         // find file with modification with date and time between 00:00 and 23:59

+ 2 - 2
src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java

@@ -35,8 +35,8 @@ import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
 
-import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.annotation.Nullable;
@@ -46,7 +46,7 @@ import javax.annotation.Nullable;
  */
 public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
 
-    private ArrayList<OCFile> mImageFiles;
+    private List<OCFile> mImageFiles;
     private Account mAccount;
     private Set<Object> mObsoleteFragments;
     private Set<Integer> mObsoletePositions;

+ 4 - 4
src/main/java/com/owncloud/android/utils/FileSortOrder.java

@@ -23,9 +23,9 @@ package com.owncloud.android.utils;
 import com.owncloud.android.datamodel.OCFile;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -59,11 +59,11 @@ public class FileSortOrder {
         mAscending = ascending;
     }
 
-    public ArrayList<OCFile> sortCloudFiles(ArrayList<OCFile> files) {
+    public List<OCFile> sortCloudFiles(List<OCFile> files) {
         return sortCloudFilesByFavourite(files);
     }
 
-    public ArrayList<File> sortLocalFiles(ArrayList<File> files) {
+    public List<File> sortLocalFiles(List<File> files) {
         return files;
     }
 
@@ -72,7 +72,7 @@ public class FileSortOrder {
      *
      * @param files files to sort
      */
-    public static ArrayList<OCFile> sortCloudFilesByFavourite(ArrayList<OCFile> files) {
+    public static List<OCFile> sortCloudFilesByFavourite(List<OCFile> files) {
         Collections.sort(files, (o1, o2) -> {
             if (o1.getIsFavorite() && o2.getIsFavorite()) {
                 return 0;

+ 1 - 1
src/main/java/com/owncloud/android/utils/FileSortOrderByDate.java

@@ -46,7 +46,7 @@ public class FileSortOrderByDate extends FileSortOrder {
      *
      * @param files list of files to sort
      */
-    public ArrayList<OCFile> sortCloudFiles(ArrayList<OCFile> files) {
+    public List<OCFile> sortCloudFiles(List<OCFile> files) {
         final int multiplier = mAscending ? 1 : -1;
 
         Collections.sort(files, new Comparator<OCFile>() {

+ 1 - 1
src/main/java/com/owncloud/android/utils/FileSortOrderByName.java

@@ -48,7 +48,7 @@ public class FileSortOrderByName extends FileSortOrder {
      * @param files files to sort
      */
     @SuppressFBWarnings(value = "Bx")
-    public ArrayList<OCFile> sortCloudFiles(ArrayList<OCFile> files) {
+    public List<OCFile> sortCloudFiles(List<OCFile> files) {
         final int multiplier = mAscending ? 1 : -1;
 
         Collections.sort(files, new Comparator<OCFile>() {

+ 1 - 1
src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java

@@ -46,7 +46,7 @@ public class FileSortOrderBySize extends FileSortOrder {
      *
      * @param files list of files to sort
      */
-    public ArrayList<OCFile> sortCloudFiles(ArrayList<OCFile> files) {
+    public List<OCFile> sortCloudFiles(List<OCFile> files) {
         final int multiplier = mAscending ? 1 : -1;
 
         Collections.sort(files, new Comparator<OCFile>() {

+ 2 - 2
src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -38,9 +38,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -196,7 +196,7 @@ public class FileStorageUtils {
         return file;
     }
 
-    public static ArrayList<OCFile> sortOcFolderDescDateModified(ArrayList<OCFile> files) {
+    public static List<OCFile> sortOcFolderDescDateModified(List<OCFile> files) {
         final int multiplier = -1;
         Collections.sort(files, (o1, o2) -> {
             @SuppressFBWarnings(value = "Bx", justification = "Would require stepping up API level")