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 a766957..a47b7de 100644 (file)
--- 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;
 
 
 package eu.alefzero.owncloud.datamodel;
 

+import java.io.File;
+import java.util.Collections;

 import java.util.Vector;
 
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import java.util.Vector;
 
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;


@@ -205,6 +207,9 @@ public class FileDataStorageManager implements DataStorageManager {
             }
 
             c.close();
             }
 
             c.close();

+            
+            Collections.sort(ret);
+            

             return ret;
         }
         return null;
             return ret;
         }
         return null;


@@ -305,6 +310,9 @@ public class FileDataStorageManager implements DataStorageManager {
                                         ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",
                                         new String[]{mAccount.name});
         }
                                         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 7e8f428..b087a9d 100644 (file)
--- 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;
 
 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
 
     public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
         @Override


@@ -321,4 +321,16 @@ public class OCFile implements Parcelable {
         dest.writeLong(mLastSyncDate);
     }
 
         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());
+    }
+

 }
 }