Merge pull request #346 from nextcloud/sortFix

Use correct array of options

Author: AndyScherzinger

src/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -30,7 +30,6 @@
 import android.os.Environment;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -108,8 +107,7 @@ public void onCreate(Bundle savedInstanceState) {
         /// USER INTERFACE
 
         // Drop-down navigation 
-        mDirectories = new CustomArrayAdapter<String>(this,
-                R.layout.support_simple_spinner_dropdown_item);
+        mDirectories = new CustomArrayAdapter<>(this, R.layout.support_simple_spinner_dropdown_item);
         File currDir = mCurrentDir;
         while(currDir != null && currDir.getParentFile() != null) {
             mDirectories.add(currDir.getName());
@@ -120,8 +118,7 @@ public void onCreate(Bundle savedInstanceState) {
         // Inflate and set the layout view
         setContentView(R.layout.upload_files_layout);
 
-        mFileListFragment = (LocalFileListFragment)
-                getSupportFragmentManager().findFragmentById(R.id.local_files_list);
+        mFileListFragment = (LocalFileListFragment) getSupportFragmentManager().findFragmentById(R.id.local_files_list);
 
 
         // Set input controllers
@@ -210,7 +207,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
                 builder.setTitle(R.string.actionbar_sort_title)
-                        .setSingleChoiceItems(R.array.actionbar_sortby, sortOrder ,
+                        .setSingleChoiceItems(R.array.menu_items_sort_by_options, sortOrder,
                                 new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int which) {
                                         switch (which){
@@ -220,6 +217,9 @@ public void onClick(DialogInterface dialog, int which) {
                                             case 1:
                                                 mFileListFragment.sortByDate(false);
                                                 break;
+                                            case 2:
+                                                mFileListFragment.sortBySize(false);
+                                                break;
                                         }
 
                                         dialog.dismiss();

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -63,7 +63,6 @@
 /**
  * This Adapter populates a ListView with following types of uploads: pending,
  * active, completed. Filtering possible.
- *
  */
 public class ExpandableUploadListAdapter extends BaseExpandableListAdapter implements Observer {
 

src/com/owncloud/android/utils/FileStorageUtils.java

@@ -335,14 +335,15 @@ public int compare(OCFile o1, OCFile o2) {
     public static File[] sortLocalFilesBySize(File[] filesArray) {
         final int multiplier = mSortAscending ? 1 : -1;
 
-        List<File> files = new ArrayList<File>(Arrays.asList(filesArray));
+        List<File> files = new ArrayList<>(Arrays.asList(filesArray));
 
         Collections.sort(files, new Comparator<File>() {
             @SuppressFBWarnings(value = "Bx")
             public int compare(File o1, File o2) {
                 if (o1.isDirectory() && o2.isDirectory()) {
-                    Long obj1 = getFolderSize(o1);
-                    return multiplier * obj1.compareTo(getFolderSize(o2));
+                    // Long obj1 = getFolderSize(o1);
+                    // return multiplier * obj1.compareTo(getFolderSize(o2));
+                    return o1.getPath().toLowerCase().compareTo(o2.getPath().toLowerCase());
                 } else if (o1.isDirectory()) {
                     return -1;
                 } else if (o2.isDirectory()) {