From: jabarros <jabarros@solidgear.es>
Date: Mon, 12 Jan 2015 13:30:06 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnailForUpload
X-Git-Tag: oc-android-1.7.0_signed~42^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6c70154a506b0963ed5aa0a402dc80a2933f1087?hp=-c

Merge branch 'develop' into thumbnailForUpload
---

6c70154a506b0963ed5aa0a402dc80a2933f1087
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 90f592fa,be470614..9c8c8e1f
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -17,7 -17,7 +17,7 @@@
   */
  package com.owncloud.android.ui.adapter;
  
 -
 +
  import java.io.File;
  import java.util.Collections;
  import java.util.Comparator;
@@@ -44,12 -44,13 +44,12 @@@ import com.owncloud.android.authenticat
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 -import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
  import com.owncloud.android.ui.activity.ComponentsGetter;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.FileStorageUtils;
 -
 +
  
  /**
   * This Adapter populates a ListView with all files and folders in an ownCloud
@@@ -59,7 -60,7 +59,7 @@@
   * @author Tobias Kaminsky
   * @author David A. Velasco
   */
 -public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 +public class FileListListAdapter extends BaseAdapter implements ListAdapter {
      private final static String PERMISSION_SHARED_WITH_ME = "S";
      
      private Context mContext;
@@@ -67,14 -68,10 +67,10 @@@
      private Vector<OCFile> mFiles = null;
      private boolean mJustFolders;
  
 -    private FileDataStorageManager mStorageManager;
 -    private Account mAccount;
 +    private FileDataStorageManager mStorageManager;
 +    private Account mAccount;
      private ComponentsGetter mTransferServiceGetter;
-     private Integer mSortOrder;
-     public static final Integer SORT_NAME = 0;
-     public static final Integer SORT_DATE = 1;
-     public static final Integer SORT_SIZE = 2;
-     private Boolean mSortAscending;
+     
      private SharedPreferences mAppPreferences;
      
      public FileListListAdapter(
@@@ -86,22 -83,22 +82,22 @@@
          mJustFolders = justFolders;
          mContext = context;
          mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
 -
 -        mTransferServiceGetter = transferServiceGetter;
 +
 +        mTransferServiceGetter = transferServiceGetter;
          
          mAppPreferences = PreferenceManager
                  .getDefaultSharedPreferences(mContext);
          
          // Read sorting order, default to sort by name ascending
-         mSortOrder = mAppPreferences
 -        FileStorageUtils.mSortOrder = mAppPreferences
--                .getInt("sortOrder", 0);
-         mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
 -        FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
++        FileStorageUtils.mSortOrder = mAppPreferences.getInt("sortOrder", 0);
++        FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
++
          
          // initialise thumbnails cache on background thread
          new ThumbnailsCacheManager.InitDiskCacheTask().execute();
  
      }
 -    
 +    
      @Override
      public boolean areAllItemsEnabled() {
          return true;
@@@ -213,18 -210,16 +209,18 @@@
                      if (thumbnail != null && !file.needsUpdateThumbnail()){
                          fileIcon.setImageBitmap(thumbnail);
                      } else {
 +
                          // generate new Thumbnail
                          if (ThumbnailsCacheManager.cancelPotentialWork(file, fileIcon)) {
 -                            final ThumbnailsCacheManager.ThumbnailGenerationTask task = 
 +                            final ThumbnailsCacheManager.ThumbnailGenerationTask task =
                                      new ThumbnailsCacheManager.ThumbnailGenerationTask(
                                              fileIcon, mStorageManager, mAccount
                                      );
                              if (thumbnail == null) {
                                  thumbnail = ThumbnailsCacheManager.mDefaultImg;
                              }
 -                            final AsyncDrawable asyncDrawable = new AsyncDrawable(
 +                            final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
 +                                    new ThumbnailsCacheManager.AsyncDrawable(
                                      mContext.getResources(), 
                                      thumbnail, 
                                      task
@@@ -234,9 -229,11 +230,9 @@@
                          }
                      }
                  } else {
 -                    fileIcon.setImageResource(
 -                            DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())
 -                    );
 +                    fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(), file.getFileName()));
                  }
 -
 +
                  if (checkIfFileIsSharedWithMe(file)) {
                      sharedWithMeIconV.setVisibility(View.VISIBLE);
                  }
@@@ -249,7 -246,7 +245,7 @@@
  //                } else {
                      fileSizeV.setVisibility(View.INVISIBLE);
  //                }
 -
 +
                  lastModV.setVisibility(View.VISIBLE);
                  lastModV.setText(showRelativeTimestamp(file));
                  checkBoxV.setVisibility(View.GONE);
@@@ -260,7 -257,7 +256,7 @@@
                      sharedWithMeIconV.setVisibility(View.VISIBLE);
                  } else {
                      fileIcon.setImageResource(
 -                            DisplayUtils.getResourceId(file.getMimetype(), file.getFileName())
 +                            DisplayUtils.getFileTypeIconId(file.getMimetype(), file.getFileName())
                      );
                  }
  
@@@ -280,7 -277,7 +276,7 @@@
  
          return view;
      }
 -
 +
      /**
       * Local Folder size in human readable format
       * 
@@@ -293,34 -290,15 +289,34 @@@
          File dir = new File(path);
  
          if (dir.exists()) {
-             long bytes = getFolderSize(dir);
+             long bytes = FileStorageUtils.getFolderSize(dir);
              return DisplayUtils.bytesToHumanReadable(bytes);
          }
  
          return "0 B";
      }
  
 -    
 -
 +    /**
 +     * Local Folder size
 +     * @param dir File
 +     * @return Size in bytes
 +     */
 +    private long getFolderSize(File dir) {
 +        if (dir.exists()) {
 +            long result = 0;
 +            File[] fileList = dir.listFiles();
 +            for(int i = 0; i < fileList.length; i++) {
 +                if(fileList[i].isDirectory()) {
 +                    result += getFolderSize(fileList[i]);
 +                } else {
 +                    result += fileList[i].length();
 +                }
 +            }
 +            return result;
 +        }
 +        return 0;
 +    } 
 +
      @Override
      public int getViewTypeCount() {
          return 1;
@@@ -358,29 -336,11 +354,11 @@@
              mFiles = null;
          }
  
-         sortDirectory();
-     }
-     
-     /**
-      * Sorts all filenames, regarding last user decision 
-      */
-     private void sortDirectory(){
-         switch (mSortOrder){
-         case 0:
-             sortByName(mSortAscending);
-             break;
-         case 1:
-             sortByDate(mSortAscending);
-             break;
-         case 2: 
-             sortBySize(mSortAscending);
-             break;
-         }
-         
+         mFiles = FileStorageUtils.sortFolder(mFiles);
          notifyDataSetChanged();
      }
      
-     
+ 
      /**
       * Filter for getting only the folders
       * @param files
@@@ -413,110 -373,24 +391,23 @@@
                  && file.getPermissions().contains(PERMISSION_SHARED_WITH_ME));
      }
  
-     /**
-      * Sorts list by Date
-      * @param sortAscending true: ascending, false: descending
-      */
-     private void sortByDate(boolean sortAscending){
-         final Integer val;
-         if (sortAscending){
-             val = 1;
-         } else {
-             val = -1;
-         }
-         
-         Collections.sort(mFiles, new Comparator<OCFile>() {
-             public int compare(OCFile o1, OCFile o2) {
-                 if (o1.isFolder() && o2.isFolder()) {
-                     Long obj1 = o1.getModificationTimestamp();
-                     return val * obj1.compareTo(o2.getModificationTimestamp());
-                 }
-                 else if (o1.isFolder()) {
-                     return -1;
-                 } else if (o2.isFolder()) {
-                     return 1;
-                 } else if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
-                     return 0;
-                 } else {
-                     Long obj1 = o1.getModificationTimestamp();
-                     return val * obj1.compareTo(o2.getModificationTimestamp());
-                 }
-             }
-         });
-     }
- 
-     /**
-      * Sorts list by Size
-      * @param sortAscending true: ascending, false: descending
-      */
-     private void sortBySize(boolean sortAscending){
-         final Integer val;
-         if (sortAscending){
-             val = 1;
-         } else {
-             val = -1;
-         }
-         
-         Collections.sort(mFiles, new Comparator<OCFile>() {
-             public int compare(OCFile o1, OCFile o2) {
-                 if (o1.isFolder() && o2.isFolder()) {
-                     Long obj1 = getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o1)));
-                     return val * obj1.compareTo(getFolderSize(new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, o2))));
-                 }
-                 else if (o1.isFolder()) {
-                     return -1;
-                 } else if (o2.isFolder()) {
-                     return 1;
-                 } else if (o1.getFileLength() == 0 || o2.getFileLength() == 0){
-                     return 0;
-                 } else {
-                     Long obj1 = o1.getFileLength();
-                     return val * obj1.compareTo(o2.getFileLength());
-                 }
-             }
-         });
-     }
- 
-     /**
-      * Sorts list by Name
-      * @param sortAscending true: ascending, false: descending
-      */
-     private void sortByName(boolean sortAscending){
-         final Integer val;
-         if (sortAscending){
-             val = 1;
-         } else {
-             val = -1;
-         }
- 
-         Collections.sort(mFiles, new Comparator<OCFile>() {
-             public int compare(OCFile o1, OCFile o2) {
-                 if (o1.isFolder() && o2.isFolder()) {
-                     return val * o1.getRemotePath().toLowerCase().compareTo(o2.getRemotePath().toLowerCase());
-                 } else if (o1.isFolder()) {
-                     return -1;
-                 } else if (o2.isFolder()) {
-                     return 1;
-                 }
-                 return val * new AlphanumComparator().compare(o1, o2);
-             }
-         });
-     }
- 
      public void setSortOrder(Integer order, boolean ascending) {
          SharedPreferences.Editor editor = mAppPreferences.edit();
          editor.putInt("sortOrder", order);
          editor.putBoolean("sortAscending", ascending);
          editor.commit();
          
-         mSortOrder = order;
-         mSortAscending = ascending;
+         FileStorageUtils.mSortOrder = order;
+         FileStorageUtils.mSortAscending = ascending;
          
-         sortDirectory();
 -
++
+         mFiles = FileStorageUtils.sortFolder(mFiles);
+         notifyDataSetChanged();
+ 
      }    
      
      private CharSequence showRelativeTimestamp(OCFile file){
          return DisplayUtils.getRelativeDateTimeString(mContext, file.getModificationTimestamp(),
                  DateUtils.SECOND_IN_MILLIS, DateUtils.WEEK_IN_MILLIS, 0);
 -    }
 -
 +    }
  }