Merge branch 'develop' into thumbnailForUpload

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 90f592f,be47061..9c8c8e1
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -67,14 -68,10 +67,10 @@@ public class FileListListAdapter extend
      private Vector<OCFile> mFiles = null;\r
      private boolean mJustFolders;\r
  \r
 -    private FileDataStorageManager mStorageManager;
 -    private Account mAccount;
 +    private FileDataStorageManager mStorageManager;\r
 +    private Account mAccount;\r
      private ComponentsGetter mTransferServiceGetter;\r
-     private Integer mSortOrder;\r
-     public static final Integer SORT_NAME = 0;\r
-     public static final Integer SORT_DATE = 1;\r
-     public static final Integer SORT_SIZE = 2;\r
-     private Boolean mSortAscending;\r
+     \r
      private SharedPreferences mAppPreferences;\r
      \r
      public FileListListAdapter(\r
@@@ -93,9 -90,9 +89,9 @@@
                  .getDefaultSharedPreferences(mContext);\r
          \r
          // Read sorting order, default to sort by name ascending\r
-         mSortOrder = mAppPreferences\r
 -        FileStorageUtils.mSortOrder = mAppPreferences\r
--                .getInt("sortOrder", 0);\r
-         mSortAscending = mAppPreferences.getBoolean("sortAscending", true);\r
 -        FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
++        FileStorageUtils.mSortOrder = mAppPreferences.getInt("sortOrder", 0);\r
++        FileStorageUtils.mSortAscending = mAppPreferences.getBoolean("sortAscending", true);\r
++\r
          \r
          // initialise thumbnails cache on background thread\r
          new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
@@@ -509,10 -379,13 +397,13 @@@
          editor.putBoolean("sortAscending", ascending);\r
          editor.commit();\r
          \r
-         mSortOrder = order;\r
-         mSortAscending = ascending;\r
+         FileStorageUtils.mSortOrder = order;\r
+         FileStorageUtils.mSortAscending = ascending;\r
          \r
-         sortDirectory();\r
 -
++\r
+         mFiles = FileStorageUtils.sortFolder(mFiles);\r
+         notifyDataSetChanged();\r
+ \r
      }    \r
      \r
      private CharSequence showRelativeTimestamp(OCFile file){\r