From: jabarros <jabarros@solidgear.es>
Date: Mon, 27 Oct 2014 14:12:48 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnails_from_server
X-Git-Tag: oc-android-1.7.0_signed~121^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dcb985481be4b3c4e4e805b4aefebae00f9ad3e9?hp=--cc

Merge branch 'develop' into thumbnails_from_server

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

dcb985481be4b3c4e4e805b4aefebae00f9ad3e9
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index d74bbc5b,9a2a0d3a..048173a9
--- a/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;
          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
+                 .getInt("sortOrder", 0);
+         mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
+         
          // initialise thumbnails cache on background thread
 -        new ThumbnailsCacheManager.InitDiskCacheTask().execute();
 +        new ThumbnailsCacheManager.InitDiskCacheTask(mAccount, mContext).execute();
 +
      }
-     
+     
      @Override
      public boolean areAllItemsEnabled() {
          return true;