code enhancements

src/main/java/com/owncloud/android/db/PreferenceManager.java

@@ -1,18 +1,18 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author David A. Velasco
  * Copyright (C) 2016 ownCloud Inc.
- * <p/>
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p/>
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p/>
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -50,7 +50,8 @@ public abstract class PreferenceManager {
     private static final String PREF__INSTANT_UPLOAD_PATH_USE_SUBFOLDERS = "instant_upload_path_use_subfolders";
     private static final String PREF__INSTANT_UPLOAD_ON_WIFI = "instant_upload_on_wifi";
     private static final String PREF__INSTANT_VIDEO_UPLOAD_ON_WIFI = "instant_video_upload_on_wifi";
-    private static final String PREF__INSTANT_VIDEO_UPLOAD_PATH_USE_SUBFOLDERS = "instant_video_upload_path_use_subfolders";
+    private static final String PREF__INSTANT_VIDEO_UPLOAD_PATH_USE_SUBFOLDERS
+            = "instant_video_upload_path_use_subfolders";
     private static final String PREF__LEGACY_CLEAN = "legacyClean";
     private static final String PREF__AUTO_UPLOAD_UPDATE_PATH = "autoUploadPathUpdate";
     private static final String PREF__PUSH_TOKEN = "pushToken";
@@ -97,7 +98,8 @@ public abstract class PreferenceManager {
     }
 
     public static boolean instantVideoUploadWhenChargingOnly(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("instant_video_upload_on_charging", false);
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("instant_video_upload_on_charging",
+                false);
     }
 
     public static boolean showHiddenFilesEnabled(Context context) {
@@ -182,7 +184,8 @@ public abstract class PreferenceManager {
      *
      * @param context Caller {@link Context}, used to access to preferences manager.
      * @param folder Folder
-     * @return preference value, default is {@link com.owncloud.android.ui.fragment.OCFileListFragment#FOLDER_LAYOUT_LIST}
+     * @return preference value, default is 
+     * {@link com.owncloud.android.ui.fragment.OCFileListFragment#FOLDER_LAYOUT_LIST}
      */
     public static String getFolderLayout(Context context, OCFile folder) {
         return getFolderPreference(context, PREF__FOLDER_LAYOUT, folder, FOLDER_LAYOUT_LIST);
@@ -206,7 +209,8 @@ public abstract class PreferenceManager {
      * @return sort order     the sort order, default is {@link FileSortOrder#sort_a_to_z} (sort by name)
      */
     public static FileSortOrder getSortOrder(Context context, OCFile folder) {
-        return FileSortOrder.sortOrders.get(getFolderPreference(context, PREF__FOLDER_SORT_ORDER, folder, FileSortOrder.sort_a_to_z.mName));
+        return FileSortOrder.sortOrders.get(getFolderPreference(context, PREF__FOLDER_SORT_ORDER, folder,
+                FileSortOrder.sort_a_to_z.mName));
     }
 
     /**
@@ -229,7 +233,8 @@ public abstract class PreferenceManager {
      * @param defaultValue Fallback value in case no ancestor is set.
      * @return Preference value
      */
-    public static String getFolderPreference(Context context, String preferenceName, OCFile folder, String defaultValue) {
+    public static String getFolderPreference(Context context, String preferenceName, OCFile folder,
+                                             String defaultValue) {
         Account account = AccountUtils.getCurrentOwnCloudAccount(context);
         ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
         FileDataStorageManager storageManager = ((ComponentsGetter)context).getStorageManager();
@@ -256,7 +261,9 @@ public abstract class PreferenceManager {
     }
 
     private static String getKeyFromFolder(String preferenceName, OCFile folder) {
-        final String folderIdString = String.valueOf(folder != null ? folder.getFileId() : FileDataStorageManager.ROOT_PARENT_ID);
+        final String folderIdString = String.valueOf(folder != null ? folder.getFileId() :
+                FileDataStorageManager.ROOT_PARENT_ID);
+        
         return preferenceName + "_" + folderIdString;
     }
 

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -776,22 +776,19 @@ public class FileDisplayActivity extends HookActivity
                 ft.addToBackStack(null);
 
                 SortingOrderDialogFragment mSortingOrderDialogFragment = SortingOrderDialogFragment.newInstance(
-                        getSortOrder(this, getListOfFilesFragment().getCurrentFile())
-                );
-                mSortingOrderDialogFragment.show(ft, SortingOrderDialogFragment.SORTING_ORDER_FRAGRMENT);
+                        getSortOrder(this, getListOfFilesFragment().getCurrentFile()));
+                mSortingOrderDialogFragment.show(ft, SortingOrderDialogFragment.SORTING_ORDER_FRAGMENT);
 
                 break;
             }
             case R.id.action_switch_view: {
                 if (isGridView()) {
                     item.setTitle(getString(R.string.action_switch_grid_view));
-                    item.setIcon(ContextCompat.getDrawable(getApplicationContext(),
-                            R.drawable.ic_view_module));
+                    item.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_view_module));
                     getListOfFilesFragment().setListAsPreferred();
                 } else {
                     item.setTitle(getApplicationContext().getString(R.string.action_switch_list_view));
-                    item.setIcon(ContextCompat.getDrawable(getApplicationContext(),
-                            R.drawable.ic_view_list));
+                    item.setIcon(ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_view_list));
                     getListOfFilesFragment().setGridAsPreferred();
                 }
                 break;

src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -1041,7 +1041,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 SortingOrderDialogFragment mSortingOrderDialogFragment = SortingOrderDialogFragment.newInstance(
                         getSortOrder(this, mFile));
                 mSortingOrderDialogFragment.show(getSupportFragmentManager(),
-                        SortingOrderDialogFragment.SORTING_ORDER_FRAGRMENT);
+                        SortingOrderDialogFragment.SORTING_ORDER_FRAGMENT);
                 break;
             default:
                 retval = super.onOptionsItemSelected(item);

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

@@ -159,7 +159,7 @@ public class UploadFilesActivity extends FileActivity implements
         int localBehaviour = PreferenceManager.getUploaderBehaviour(this);
 
         // file upload spinner
-        mBehaviourSpinner = (Spinner) findViewById(R.id.upload_files_spinner_behaviour);
+        mBehaviourSpinner = findViewById(R.id.upload_files_spinner_behaviour);
         ArrayAdapter<CharSequence> behaviourAdapter = ArrayAdapter.createFromResource(this,
                 R.array.upload_files_behaviour, android.R.layout.simple_spinner_item);
         behaviourAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -241,8 +241,7 @@ public class UploadFilesActivity extends FileActivity implements
                 ft.addToBackStack(null);
 
                 SortingOrderDialogFragment mSortingOrderDialogFragment = SortingOrderDialogFragment.newInstance(
-                        getSortOrder(this, null)
-                );
+                        getSortOrder(this, null));
                 mSortingOrderDialogFragment.show(ft, SORT_ORDER_DIALOG_TAG);
 
                 break;
@@ -257,6 +256,7 @@ public class UploadFilesActivity extends FileActivity implements
                     item.setIcon(R.drawable.ic_view_list);
                     mFileListFragment.switchToGridView();
                 }
+                break;
             }
             default:
                 retval = super.onOptionsItemSelected(item);

src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -503,7 +503,8 @@ public class FileListListAdapter extends BaseAdapter {
         }
     }
 
-    public void setData(ArrayList<Object> objects, ExtendedListFragment.SearchType searchType, FileDataStorageManager storageManager, OCFile folder) {
+    public void setData(ArrayList<Object> objects, ExtendedListFragment.SearchType searchType,
+                        FileDataStorageManager storageManager, OCFile folder) {
         if (storageManager != null && mStorageManager == null) {
             mStorageManager = storageManager;
         }

src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Andy Scherzinger
@@ -45,7 +45,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
 
     private final static String TAG = SortingOrderDialogFragment.class.getSimpleName();
 
-    public static final String SORTING_ORDER_FRAGRMENT = "SORTING_ORDER_FRAGRMENT";
+    public static final String SORTING_ORDER_FRAGMENT = "SORTING_ORDER_FRAGMENT";
     private static final String KEY_SORT_ORDER = "SORT_ORDER";
 
     private View mView = null;
@@ -148,12 +148,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
      * setup all listeners.
      */
     private void setupListeners() {
-        mCancel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
+        mCancel.setOnClickListener(view -> dismiss());
 
         OnSortOrderClickListener sortOrderClickListener = new OnSortOrderClickListener();
 
@@ -181,7 +176,8 @@ public class SortingOrderDialogFragment extends DialogFragment {
         @Override
         public void onClick(View v) {
             dismissAllowingStateLoss();
-            ((SortingOrderDialogFragment.OnSortingOrderListener) getActivity()).onSortingOrderChosen((FileSortOrder) v.getTag());
+            ((SortingOrderDialogFragment.OnSortingOrderListener) getActivity())
+                    .onSortingOrderChosen((FileSortOrder) v.getTag());
         }
     }
 

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author Bartek Przybylski
@@ -1097,7 +1097,8 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                             if ((activity = getActivity()) != null && activity instanceof FileDisplayActivity) {
                                 FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) activity;
                                 if (getCurrentFile() != null) {
-                                    fileDisplayActivity.setDrawerIndicatorEnabled(fileDisplayActivity.isRoot(getCurrentFile()));
+                                    fileDisplayActivity.setDrawerIndicatorEnabled(
+                                            fileDisplayActivity.isRoot(getCurrentFile()));
                                 }
                             }
 

src/main/java/com/owncloud/android/utils/FileSortOrder.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Sven R. Kunze
@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Vector;
 
 /**
- * Created by srkunze on 28.08.17.
+ * Sort order 
  */
 
 public class FileSortOrder {

src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Sven R. Kunze
@@ -33,7 +33,7 @@ import java.util.Vector;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
- * Created by srkunze on 28.08.17.
+ * Sorts files by sizes
  */
 
 public class FileSortOrderBySize extends FileSortOrder {
@@ -79,15 +79,14 @@ public class FileSortOrderBySize extends FileSortOrder {
     public File[] sortLocalFiles(File[] filesArray) {
         final int multiplier = mAscending ? 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));
-                    return o1.getPath().toLowerCase().compareTo(o2.getPath().toLowerCase());
+                    Long obj1 = FileStorageUtils.getFolderSize(o1);
+                    return multiplier * obj1.compareTo(FileStorageUtils.getFolderSize(o2));
                 } else if (o1.isDirectory()) {
                     return -1;
                 } else if (o2.isDirectory()) {