Merge branch 'develop' into thumbnails_from_server

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index d74bbc5,9a2a0d3..048173a
--- 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
@@@ -72,13 -86,20 +86,22 @@@ public class FileListListAdapter extend
          mJustFolders = justFolders;\r
          mContext = context;\r
          mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
-         mTransferServiceGetter = transferServiceGetter;\r
- \r
++
+         mTransferServiceGetter = transferServiceGetter;
+         \r
+         mAppPreferences = PreferenceManager\r
+                 .getDefaultSharedPreferences(mContext);\r
+         \r
+         // Read sorting order, default to sort by name ascending\r
+         mSortOrder = mAppPreferences\r
+                 .getInt("sortOrder", 0);\r
+         mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+         \r
          // initialise thumbnails cache on background thread\r
 -        new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
 +        new ThumbnailsCacheManager.InitDiskCacheTask(mAccount, mContext).execute();\r
 +\r
      }\r
-     \r
+     
      @Override\r
      public boolean areAllItemsEnabled() {\r
          return true;\r