From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 18 Dec 2014 20:19:39 +0000 (+0100)
Subject: renamed sortDirectory to sortFolder
X-Git-Tag: oc-android-1.7.0_signed~47^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e23fa3acaa3eb1ab7d77c05c9c3d64b3ce2867c6

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 17a936d0..563d31ed 100644
--- 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;
         }
 
-        mFiles = FileStorageUtils.sortDirectory(mFiles);
+        mFiles = FileStorageUtils.sortFolder(mFiles);
         notifyDataSetChanged();
     }
     
@@ -383,7 +383,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         FileStorageUtils.mSortOrder = order;
         FileStorageUtils.mSortAscending = ascending;
         
-        mFiles = FileStorageUtils.sortDirectory(mFiles);
+        mFiles = FileStorageUtils.sortFolder(mFiles);
         notifyDataSetChanged();
     }    
 }
diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 05671a04..3c15de71 100644
--- 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); 
         
-        mImageFiles = FileStorageUtils.sortDirectory(mImageFiles);
+        mImageFiles = FileStorageUtils.sortFolder(mImageFiles);
         
         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 de1a3207..f17124c1 100644
--- 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 
      */
-    public static Vector<OCFile> sortDirectory(Vector<OCFile> files){
+    public static Vector<OCFile> sortFolder(Vector<OCFile> files){
         switch (mSortOrder){
         case 0:
             files = FileStorageUtils.sortByName(files);