renamed sortDirectory to sortFolder

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 17a936d..563d31e 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -337,7 +337,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
             mFiles = null;\r
         }\r
 \r
             mFiles = null;\r
         }\r
 \r

-        mFiles = FileStorageUtils.sortDirectory(mFiles);\r
+        mFiles = FileStorageUtils.sortFolder(mFiles);\r

         notifyDataSetChanged();\r
     }\r
     \r
         notifyDataSetChanged();\r
     }\r
     \r


@@ -383,7 +383,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         FileStorageUtils.mSortOrder = order;\r
         FileStorageUtils.mSortAscending = ascending;\r
         \r
         FileStorageUtils.mSortOrder = order;\r
         FileStorageUtils.mSortAscending = ascending;\r
         \r

-        mFiles = FileStorageUtils.sortDirectory(mFiles);\r
+        mFiles = FileStorageUtils.sortFolder(mFiles);\r

         notifyDataSetChanged();\r
     }    
 }\r
         notifyDataSetChanged();\r
     }    
 }\r

diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 05671a0..3c15de7 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -78,7 +78,7 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
         mStorageManager = storageManager;
         mImageFiles = mStorageManager.getFolderImages(parentFolder); 
         
         mStorageManager = storageManager;
         mImageFiles = mStorageManager.getFolderImages(parentFolder); 
         

-        mImageFiles = FileStorageUtils.sortDirectory(mImageFiles);
+        mImageFiles = FileStorageUtils.sortFolder(mImageFiles);

         
         mObsoleteFragments = new HashSet<Object>();
         mObsoletePositions = new HashSet<Integer>();
         
         mObsoleteFragments = new HashSet<Object>();
         mObsoletePositions = new HashSet<Integer>();

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index de1a320..f17124c 100644 (file)
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -139,7 +139,7 @@ public class FileStorageUtils {
     /**
      * Sorts all filenames, regarding last user decision 
      */
     /**
      * Sorts all filenames, regarding last user decision 
      */

-    public static Vector<OCFile> sortDirectory(Vector<OCFile> files){
+    public static Vector<OCFile> sortFolder(Vector<OCFile> files){

         switch (mSortOrder){
         case 0:
             files = FileStorageUtils.sortByName(files);
         switch (mSortOrder){
         case 0:
             files = FileStorageUtils.sortByName(files);