From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 23 May 2012 20:40:31 +0000 (+0200)
Subject: show dirs on top of the list
X-Git-Tag: oc-android-1.4.3~390^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/49ad249816495a1c20254ac8d91abb581d86114a?ds=inline

show dirs on top of the list
---

diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
index a7669574..a47b7de7 100644
--- a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
+++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
@@ -18,6 +18,8 @@
 
 package eu.alefzero.owncloud.datamodel;
 
+import java.io.File;
+import java.util.Collections;
 import java.util.Vector;
 
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
@@ -205,6 +207,9 @@ public class FileDataStorageManager implements DataStorageManager {
             }
 
             c.close();
+            
+            Collections.sort(ret);
+            
             return ret;
         }
         return null;
@@ -305,6 +310,9 @@ public class FileDataStorageManager implements DataStorageManager {
                                         ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",
                                         new String[]{mAccount.name});
         }
+        if (file.getStoragePath() != null) {
+            new File(file.getStoragePath()).delete();
+        }
     }
 
 }
diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index 7e8f4285..b087a9df 100644
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -23,7 +23,7 @@ import java.io.File;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-public class OCFile implements Parcelable {
+public class OCFile implements Parcelable, Comparable<OCFile> {
 
     public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
         @Override
@@ -321,4 +321,16 @@ public class OCFile implements Parcelable {
         dest.writeLong(mLastSyncDate);
     }
 
+    @Override
+    public int compareTo(OCFile another) {
+        if (isDirectory() && another.isDirectory()) {
+            return getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
+        } else if (isDirectory()) {
+            return -1;
+        } else if (another.isDirectory()) {
+            return 1;
+        }
+        return getFileName().toLowerCase().compareTo(another.getFileName().toLowerCase());
+    }
+
 }