Эх сурвалжийг харах

- added requested changes

tobiasKaminsky 10 жил өмнө
parent
commit
bc4a7bfe43

+ 2 - 1
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.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;
@@ -497,7 +498,7 @@ OnSslUntrustedCertListener, SwipeRefreshLayout.OnRefreshListener {
             
             // 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)

+ 4 - 4
src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -65,9 +65,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 	private Account mAccount;
 	private final ComponentsGetter mTransferServiceGetter;
 	private Integer mSortOrder;
-	public static final Integer mSortName = 0;
-	public static final Integer mSortDate = 1;
-	public static final Integer mSortSize = 2;
+	public static final Integer SORT_NAME = 0;
+	public static final Integer SORT_DATE = 1;
+	public static final Integer SORT_SIZE = 2;
 	private Boolean mSortAscending;
 	private final SharedPreferences mAppPreferences;
 
@@ -80,7 +80,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 		mAppPreferences = PreferenceManager.getDefaultSharedPreferences(mContext);
 
 		// Read sorting order, default to sort by name ascending
-		mSortOrder = mAppPreferences.getInt("sortOrder", mSortName);
+		mSortOrder = mAppPreferences.getInt("sortOrder", SORT_NAME);
 		mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
 
 	}

+ 3 - 3
src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -380,14 +380,14 @@ public class OCFileListFragment extends ExtendedListFragment {
 	}
 
 	public void sortByName(boolean descending) {
-		mAdapter.setSortOrder(FileListListAdapter.mSortName, descending);
+		mAdapter.setSortOrder(FileListListAdapter.SORT_NAME, descending);
 	}
 
 	public void sortByDate(boolean descending) {
-		mAdapter.setSortOrder(FileListListAdapter.mSortDate, descending);
+		mAdapter.setSortOrder(FileListListAdapter.SORT_DATE, descending);
 	}
 
 	public void sortBySize(boolean descending) {
-		mAdapter.setSortOrder(FileListListAdapter.mSortSize, descending);
+		mAdapter.setSortOrder(FileListListAdapter.SORT_SIZE, descending);
 	}
 }