From 304ab15b51d59cb948670688a36a21fbc1ec1c89 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 17 Jul 2016 17:22:42 +0200
Subject: [PATCH 1/2] mix folders and files on sort by date

---
 src/com/owncloud/android/utils/FileStorageUtils.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 2a5b5253421c..694f87e1a8e7 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -279,15 +279,7 @@ public static Vector<OCFile> sortOCFilesByDate(Vector<OCFile> files){
         
         Collections.sort(files, new Comparator<OCFile>() {
             public int compare(OCFile o1, OCFile o2) {
-                if (o1.isFolder() && o2.isFolder()) {
-                    Long obj1 = o1.getModificationTimestamp();
-                    return multiplier * obj1.compareTo(o2.getModificationTimestamp());
-                }
-                else if (o1.isFolder()) {
-                    return -1;
-                } else if (o2.isFolder()) {
-                    return 1;
-                } else if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
+                if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
                     return 0;
                 } else {
                     Long obj1 = o1.getModificationTimestamp();

From 92d28b8e836863ddf7d78bc22c862e5b3ca95be8 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sun, 4 Sep 2016 19:32:14 +0200
Subject: [PATCH 2/2] mix folders and files on sort by date for local folders
 too

---
 src/com/owncloud/android/utils/FileStorageUtils.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 694f87e1a8e7..cc4aaa877b2a 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -302,15 +302,7 @@ public static File[] sortLocalFilesByDate(File[] filesArray){
 
         Collections.sort(files, new Comparator<File>() {
             public int compare(File o1, File o2) {
-                if (o1.isDirectory() && o2.isDirectory()) {
-                    Long obj1 = o1.lastModified();
-                    return multiplier * obj1.compareTo(o2.lastModified());
-                }
-                else if (o1.isDirectory()) {
-                    return -1;
-                } else if (o2.isDirectory()) {
-                    return 1;
-                } else if (o1.lastModified() == 0 || o2.lastModified() == 0){
+                if (o1.lastModified() == 0 || o2.lastModified() == 0){
                     return 0;
                 } else {
                     Long obj1 = o1.lastModified();