From: jabarros <jabarros@solidgear.es>
Date: Mon, 12 Jan 2015 13:30:06 +0000 (+0100)
Subject: Merge branch 'develop' into thumbnailForUpload
X-Git-Tag: oc-android-1.7.0_signed~42^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6c70154a506b0963ed5aa0a402dc80a2933f1087?ds=inline

Merge branch 'develop' into thumbnailForUpload
---

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