Update reference to library after upgrading TLS support

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / UploadFilesActivity.java

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index a6031cd..83e7bc0 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -34,15 +34,19 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;

+import com.actionbarsherlock.internal.view.menu.ActionMenuItemView;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;

 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.MenuItem;

+import com.owncloud.android.R;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;

 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;

-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
+import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;

 import com.owncloud.android.ui.fragment.LocalFileListFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;

-import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
+import com.owncloud.android.utils.DisplayUtils;

 import com.owncloud.android.utils.FileStorageUtils;
 
 import com.owncloud.android.utils.FileStorageUtils;
 

-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;

 
 /**
  * Displays local files and let the user choose what of them wants to upload
 
 /**
  * Displays local files and let the user choose what of them wants to upload


@@ -72,6 +76,8 @@ public class UploadFilesActivity extends FileActivity implements
     private static final String WAIT_DIALOG_TAG = "WAIT";
     private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
     
     private static final String WAIT_DIALOG_TAG = "WAIT";
     private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
     

+    private boolean selectAllToggled = false;
+    private Menu menu;

     
     @Override
     public void onCreate(Bundle savedInstanceState) {
     
     @Override
     public void onCreate(Bundle savedInstanceState) {


@@ -107,15 +113,18 @@ public class UploadFilesActivity extends FileActivity implements
         mCancelBtn.setOnClickListener(this);
         mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
         mUploadBtn.setOnClickListener(this);
         mCancelBtn.setOnClickListener(this);
         mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
         mUploadBtn.setOnClickListener(this);

+        

             
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();
             
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();

+        actionBar.setIcon(DisplayUtils.getSeasonalIconId());

         actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the official documentation
         actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null);
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         actionBar.setListNavigationCallbacks(mDirectories, this);
         
         actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the official documentation
         actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null);
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         actionBar.setListNavigationCallbacks(mDirectories, this);
         

+        

         // wait dialog
         if (mCurrentDialog != null) {
             mCurrentDialog.dismiss();
         // wait dialog
         if (mCurrentDialog != null) {
             mCurrentDialog.dismiss();


@@ -124,8 +133,15 @@ public class UploadFilesActivity extends FileActivity implements
             
         Log_OC.d(TAG, "onCreate() end");
     }
             
         Log_OC.d(TAG, "onCreate() end");
     }

-
-
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu items for use in the action bar
+        MenuInflater inflater = getSherlock().getMenuInflater();
+        inflater.inflate(R.menu.file_select_all, menu);     
+        this.menu = menu;
+        return true;
+    }
+ 

     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;


@@ -136,12 +152,33 @@ public class UploadFilesActivity extends FileActivity implements
                 }
                 break;
             }
                 }
                 break;
             }

+            case R.id.actionbar_select_all:{
+                if(selectAllToggled){
+                    toggleOffSelectAll();
+                }else{
+                    toggleOnSelectAll(item);
+                }
+                break;
+            }

             default:
                 retval = super.onOptionsItemSelected(item);
         }
         return retval;
     }
             default:
                 retval = super.onOptionsItemSelected(item);
         }
         return retval;
     }

-
+    public void toggleOffSelectAll(MenuItem item){
+        selectAllToggled = false;
+        item.setIcon(android.R.drawable.checkbox_off_background);
+        mFileListFragment.deselectAll();
+    }
+    public void toggleOffSelectAll(){
+        MenuItem item = menu.findItem(R.id.actionbar_select_all);
+        toggleOffSelectAll(item);
+    }
+    public void toggleOnSelectAll(MenuItem item){
+        selectAllToggled = true;
+        item.setIcon(android.R.drawable.checkbox_on_background);        
+        mFileListFragment.selectAll();
+    }

     
     @Override
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {
     
     @Override
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {


@@ -172,6 +209,7 @@ public class UploadFilesActivity extends FileActivity implements
             ActionBar actionBar = getSupportActionBar(); 
             actionBar.setDisplayHomeAsUpEnabled(false);
         } 
             ActionBar actionBar = getSupportActionBar(); 
             actionBar.setDisplayHomeAsUpEnabled(false);
         } 

+        toggleOffSelectAll();

     }
 
     
     }
 
     


@@ -239,10 +277,11 @@ public class UploadFilesActivity extends FileActivity implements
      * {@inheritDoc}
      */
     @Override
      * {@inheritDoc}
      */
     @Override

-    public void onDirectoryClick(File directory) {
+    public void onDirectoryClick(File directory) { 

         pushDirname(directory);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         pushDirname(directory);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);

+        toggleOffSelectAll();

     }
     
     
     }
     
     


@@ -377,6 +416,7 @@ public class UploadFilesActivity extends FileActivity implements
 
     @Override
     protected void onAccountSet(boolean stateWasRecovered) {
 
     @Override
     protected void onAccountSet(boolean stateWasRecovered) {

+        super.onAccountSet(stateWasRecovered);

         if (getAccount() != null) {
             if (!mAccountOnCreation.equals(getAccount())) {
                 setResult(RESULT_CANCELED);
         if (getAccount() != null) {
             if (!mAccountOnCreation.equals(getAccount())) {
                 setResult(RESULT_CANCELED);


@@ -384,7 +424,6 @@ public class UploadFilesActivity extends FileActivity implements
             }
             
         } else {
             }
             
         } else {

-            Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");

             setResult(RESULT_CANCELED);
             finish();
         }
             setResult(RESULT_CANCELED);
             finish();
         }