From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 2 Oct 2015 14:04:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
X-Git-Tag: oc-android-1.9^2~59^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7579d3daf7dd2135877b1029d0576fa2cb60aaaa?ds=inline;hp=-c

Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
---

7579d3daf7dd2135877b1029d0576fa2cb60aaaa
diff --combined src/com/owncloud/android/utils/FileStorageUtils.java
index 2b6d68b3,d6ebdbd3..39837717
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@@ -46,12 -46,12 +46,12 @@@ import android.webkit.MimeTypeMap
   * 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 Integer mSortOrder = SORT_NAME;
+     public static Boolean mSortAscending = true;
+ 
      
      //private static final String LOG_TAG = "FileStorageUtils";
  
@@@ -254,7 -254,7 +254,7 @@@
          Collections.sort(files, new Comparator<OCFile>() {
              public int compare(OCFile o1, OCFile o2) {
                  if (o1.isFolder() && o2.isFolder()) {
 -                    return val * o1.getRemotePath().toLowerCase().compareTo(o2.getRemotePath().toLowerCase());
 +                    return val * new AlphanumComparator().compare(o1, o2);
                  } else if (o1.isFolder()) {
                      return -1;
                  } else if (o2.isFolder()) {