From: masensio <masensio@solidgear.es>
Date: Wed, 30 Sep 2015 10:24:01 +0000 (+0200)
Subject: Merge branch 'master' into sync_full_folder
X-Git-Tag: oc-android-1.9^2~37^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9494620cc4f61450223658e703f16bfa63248522?ds=inline;hp=--cc

Merge branch 'master' into sync_full_folder

Conflicts:
	src/com/owncloud/android/providers/FileContentProvider.java
---

9494620cc4f61450223658e703f16bfa63248522
diff --cc src/com/owncloud/android/utils/FileStorageUtils.java
index ac39196a,d6ebdbd3..da1b69e7
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@@ -50,10 -49,12 +50,10 @@@ public class FileStorageUtils 
      public static final Integer SORT_NAME = 0;
      public static final Integer SORT_DATE = 1;
      public static final Integer SORT_SIZE = 2;
-   
+     public static Integer mSortOrder = SORT_NAME;
+     public static Boolean mSortAscending = true;
+ 
      
 -    //private static final String LOG_TAG = "FileStorageUtils";
 -
      public static final String getSavePath(String accountName) {
          File sdCard = Environment.getExternalStorageDirectory();
          return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");