X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/20cd00b22c86ef0ab03ae0b8cd8eedd63844981f..524a6e2bdd230742807de3b01cf414e8e62e1920:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index c86380d6..12ea1184 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -153,7 +153,7 @@ OnSslUntrustedCertListener, SwipeRefreshLayout.OnRefreshListener {
     private String DIALOG_UNTRUSTED_CERT;
     
     private OCFile mWaitingToSend;
-
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log_OC.d(TAG, "onCreate() start");
@@ -492,35 +492,37 @@ OnSslUntrustedCertListener, SwipeRefreshLayout.OnRefreshListener {
             break;
         }
         case R.id.action_sort: {
+            SharedPreferences appPreferences = PreferenceManager
+                    .getDefaultSharedPreferences(this);
+            
+            // Read sorting order, default to sort by name ascending
+            Integer sortOrder = appPreferences
+                    .getInt("sortOrder", 0);
+            
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.actionbar_sort_title)
-            .setItems(R.array.actionbar_sortby, new DialogInterface.OnClickListener() {
+            .setSingleChoiceItems(R.array.actionbar_sortby, sortOrder , new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
-                    Log_OC.d("default view", " number " + which + "clicked");
+                    
                     switch (which){
                     case 0:
                         sortByName(true);
                         break;
                     case 1:
-                        sortByName(false);
-                        break;
-                    case 2:
-                        sortByDate(true);
-                        break;
-                    case 3:
                         sortByDate(false);
                         break;
-                    case 4:
-                        sortBySize(true);
-                        break;
-                    case 5:
-                        sortBySize(false);
-                        break;
+                        
+// TODO re-enable when server-side folder size calculation is available                       
+//                    case 2:
+//                        sortBySize(false);
+//                        break;
                     }
+                    
+                    dialog.dismiss();
+                    
                 }
             });
-            builder.create();
-            builder.show();
+            builder.create().show();
             break;
         }
         default: