- added requested changes

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 12ea118..cd37563 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -90,6 +90,7 @@ import com.owncloud.android.operations.SynchronizeFolderOperation;
 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.services.observer.FileObserverService;
 import com.owncloud.android.syncadapter.FileSyncAdapter;
 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.services.observer.FileObserverService;
 import com.owncloud.android.syncadapter.FileSyncAdapter;

+import com.owncloud.android.ui.adapter.FileListListAdapter;

 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;


@@ -497,7 +498,7 @@ OnSslUntrustedCertListener, SwipeRefreshLayout.OnRefreshListener {
             
             // Read sorting order, default to sort by name ascending
             Integer sortOrder = appPreferences
             
             // Read sorting order, default to sort by name ascending
             Integer sortOrder = appPreferences

-                    .getInt("sortOrder", 0);
+                    .getInt("sortOrder", FileListListAdapter.SORT_NAME);

             
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.actionbar_sort_title)
             
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.actionbar_sort_title)

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index a2cb3be..5945531 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -65,9 +65,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
        private Account mAccount;\r
        private final ComponentsGetter mTransferServiceGetter;\r
        private Integer mSortOrder;\r
        private Account mAccount;\r
        private final ComponentsGetter mTransferServiceGetter;\r
        private Integer mSortOrder;\r

-       public static final Integer mSortName = 0;\r
-       public static final Integer mSortDate = 1;\r
-       public static final Integer mSortSize = 2;\r
+       public static final Integer SORT_NAME = 0;\r
+       public static final Integer SORT_DATE = 1;\r
+       public static final Integer SORT_SIZE = 2;\r

        private Boolean mSortAscending;\r
        private final SharedPreferences mAppPreferences;\r
 \r
        private Boolean mSortAscending;\r
        private final SharedPreferences mAppPreferences;\r
 \r


@@ -80,7 +80,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                mAppPreferences = PreferenceManager.getDefaultSharedPreferences(mContext);\r
 \r
                // Read sorting order, default to sort by name ascending\r
                mAppPreferences = PreferenceManager.getDefaultSharedPreferences(mContext);\r
 \r
                // Read sorting order, default to sort by name ascending\r

-               mSortOrder = mAppPreferences.getInt("sortOrder", mSortName);\r
+               mSortOrder = mAppPreferences.getInt("sortOrder", SORT_NAME);\r

                mSortAscending = mAppPreferences.getBoolean("sortAscending", true);\r
 \r
        }\r
                mSortAscending = mAppPreferences.getBoolean("sortAscending", true);\r
 \r
        }\r

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 19829fa..caba72b 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -380,14 +380,14 @@ public class OCFileListFragment extends ExtendedListFragment {
        }
 
        public void sortByName(boolean descending) {
        }
 
        public void sortByName(boolean descending) {

-               mAdapter.setSortOrder(FileListListAdapter.mSortName, descending);
+               mAdapter.setSortOrder(FileListListAdapter.SORT_NAME, descending);

        }
 
        public void sortByDate(boolean descending) {
        }
 
        public void sortByDate(boolean descending) {

-               mAdapter.setSortOrder(FileListListAdapter.mSortDate, descending);
+               mAdapter.setSortOrder(FileListListAdapter.SORT_DATE, descending);

        }
 
        public void sortBySize(boolean descending) {
        }
 
        public void sortBySize(boolean descending) {

-               mAdapter.setSortOrder(FileListListAdapter.mSortSize, descending);
+               mAdapter.setSortOrder(FileListListAdapter.SORT_SIZE, descending);

        }
 }
        }
 }