Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Uploader.java

diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index 99ca54e..daa136d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -335,7 +335,7 @@ public class Uploader extends FileActivity
         // click on folder in the list
         Log_OC.d(TAG, "on item click");
         // TODO Enable when "On Device" is recovered ?
         // click on folder in the list
         Log_OC.d(TAG, "on item click");
         // TODO Enable when "On Device" is recovered ?

-        Vector<OCFile> tmpfiles = getStorageManager().getFolderContent(mFile /*, false*/);
+        Vector<OCFile> tmpfiles = getStorageManager().getFolderContent(mFile , false);

         tmpfiles = sortFileList(tmpfiles);
 
         if (tmpfiles.size() <= 0) return;
         tmpfiles = sortFileList(tmpfiles);
 
         if (tmpfiles.size() <= 0) return;


@@ -423,7 +423,7 @@ public class Uploader extends FileActivity
         mFile = getStorageManager().getFileByPath(full_path);
         if (mFile != null) {
             // TODO Enable when "On Device" is recovered ?
         mFile = getStorageManager().getFileByPath(full_path);
         if (mFile != null) {
             // TODO Enable when "On Device" is recovered ?

-            Vector<OCFile> files = getStorageManager().getFolderContent(mFile/*, false*/);
+            Vector<OCFile> files = getStorageManager().getFolderContent(mFile, false);

             files = sortFileList(files);
 
             List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();
             files = sortFileList(files);
 
             List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();


@@ -460,7 +460,7 @@ public class Uploader extends FileActivity
         FileStorageUtils.mSortOrder = sharedPreferences.getInt("sortOrder", 0);
         FileStorageUtils.mSortAscending = sharedPreferences.getBoolean("sortAscending", true);
 
         FileStorageUtils.mSortOrder = sharedPreferences.getInt("sortOrder", 0);
         FileStorageUtils.mSortAscending = sharedPreferences.getBoolean("sortAscending", true);
 

-        files = FileStorageUtils.sortFolder(files);
+        files = FileStorageUtils.sortOcFolder(files);

         return files;
     }
 
         return files;
     }
 


@@ -675,7 +675,6 @@ public class Uploader extends FileActivity
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);

-        menu.findItem(R.id.action_upload).setVisible(false);

         menu.findItem(R.id.action_sort).setVisible(false);
         menu.findItem(R.id.action_sync_account).setVisible(false);
         return true;
         menu.findItem(R.id.action_sort).setVisible(false);
         menu.findItem(R.id.action_sync_account).setVisible(false);
         return true;