- added lgpgl

[pub/Android/ownCloud.git] / 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 c86380d..12ea118 100644 (file)
--- 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;
     private String DIALOG_UNTRUSTED_CERT;
     
     private OCFile mWaitingToSend;

-
+    

     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log_OC.d(TAG, "onCreate() start");
     @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: {
             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)
             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) {
                 public void onClick(DialogInterface dialog, int which) {

-                    Log_OC.d("default view", " number " + which + "clicked");
+                    

                     switch (which){
                     case 0:
                         sortByName(true);
                         break;
                     case 1:
                     switch (which){
                     case 0:
                         sortByName(true);
                         break;
                     case 1:

-                        sortByName(false);
-                        break;
-                    case 2:
-                        sortByDate(true);
-                        break;
-                    case 3:

                         sortByDate(false);
                         break;
                         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:
             break;
         }
         default: