Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation

[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / FileStorageUtils.java

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index ac39196..da1b69e 100644 (file)
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -47,12 +47,12 @@ import android.webkit.MimeTypeMap;
  * Static methods to help in access to local file system.
  */
 public class FileStorageUtils {
  * Static methods to help in access to local file system.
  */
 public class FileStorageUtils {

-    public static Integer mSortOrder;
-    public static Boolean mSortAscending;

     public static final Integer SORT_NAME = 0;
     public static final Integer SORT_DATE = 1;
     public static final Integer SORT_SIZE = 2;
     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;
+

     
     public static final String getSavePath(String accountName) {
         File sdCard = Environment.getExternalStorageDirectory();
     
     public static final String getSavePath(String accountName) {
         File sdCard = Environment.getExternalStorageDirectory();