X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4c50eb4d2dd1fba177d743315ae52223430db8cb..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/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 a75d2c29..7eff9b45 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -1,10 +1,9 @@ /* ownCloud Android client application - * Copyright (C) 2011 Bartek Przybylski + * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,10 +19,12 @@ package com.owncloud.android.ui.activity; import java.io.File; +import android.accounts.Account; import android.content.Intent; +import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; -import android.util.Log; +import android.support.v4.app.DialogFragment; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -33,11 +34,16 @@ import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar.OnNavigationListener; -import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; +import com.owncloud.android.R; +import com.owncloud.android.ui.dialog.IndeterminateProgressDialog; +import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; 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.Log_OC; -import com.owncloud.android.R; /** * Displays local files and let the user choose what of them wants to upload @@ -47,32 +53,40 @@ import com.owncloud.android.R; * */ -public class UploadFilesActivity extends SherlockFragmentActivity implements - LocalFileListFragment.ContainerActivity, OnNavigationListener, OnClickListener { +public class UploadFilesActivity extends FileActivity implements + LocalFileListFragment.ContainerActivity, OnNavigationListener, OnClickListener, ConfirmationDialogFragmentListener { private ArrayAdapter mDirectories; private File mCurrentDir = null; private LocalFileListFragment mFileListFragment; private Button mCancelBtn; private Button mUploadBtn; + private Account mAccountOnCreation; + private DialogFragment mCurrentDialog; - public static final String EXTRA_DIRECTORY_PATH = "com.owncloud.android.Directory"; - public static final String EXTRA_CHOSEN_FILES = "com.owncloud.android.ChosenFiles"; + public static final String EXTRA_CHOSEN_FILES = UploadFilesActivity.class.getCanonicalName() + ".EXTRA_CHOSEN_FILES"; + + public static final int RESULT_OK_AND_MOVE = RESULT_FIRST_USER; + private static final String KEY_DIRECTORY_PATH = UploadFilesActivity.class.getCanonicalName() + ".KEY_DIRECTORY_PATH"; private static final String TAG = "UploadFilesActivity"; + private static final String WAIT_DIALOG_TAG = "WAIT"; + private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE"; @Override public void onCreate(Bundle savedInstanceState) { - Log.d(TAG, "onCreate() start"); + Log_OC.d(TAG, "onCreate() start"); super.onCreate(savedInstanceState); if(savedInstanceState != null) { - mCurrentDir = new File(savedInstanceState.getString(UploadFilesActivity.EXTRA_DIRECTORY_PATH)); + mCurrentDir = new File(savedInstanceState.getString(UploadFilesActivity.KEY_DIRECTORY_PATH)); } else { mCurrentDir = Environment.getExternalStorageDirectory(); } + mAccountOnCreation = getAccount(); + /// USER INTERFACE // Drop-down navigation @@ -94,16 +108,24 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements mCancelBtn.setOnClickListener(this); mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload); mUploadBtn.setOnClickListener(this); + // 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); + + // wait dialog + if (mCurrentDialog != null) { + mCurrentDialog.dismiss(); + mCurrentDialog = null; + } - Log.d(TAG, "onCreate() end"); + Log_OC.d(TAG, "onCreate() end"); } @@ -118,7 +140,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements break; } default: - retval = onOptionsItemSelected(item); + retval = super.onOptionsItemSelected(item); } return retval; } @@ -159,10 +181,10 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override protected void onSaveInstanceState(Bundle outState) { // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved - Log.d(TAG, "onSaveInstanceState() start"); + Log_OC.d(TAG, "onSaveInstanceState() start"); super.onSaveInstanceState(outState); - outState.putString(UploadFilesActivity.EXTRA_DIRECTORY_PATH, mCurrentDir.getAbsolutePath()); - Log.d(TAG, "onSaveInstanceState() end"); + outState.putString(UploadFilesActivity.KEY_DIRECTORY_PATH, mCurrentDir.getAbsolutePath()); + Log_OC.d(TAG, "onSaveInstanceState() end"); } @@ -246,6 +268,9 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements /** * Performs corresponding action when user presses 'Cancel' or 'Upload' button + * + * TODO Make here the real request to the Upload service ; will require to receive the account and + * target folder where the upload must be done in the received intent. */ @Override public void onClick(View v) { @@ -254,11 +279,119 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements finish(); } else if (v.getId() == R.id.upload_files_btn_upload) { + new CheckAvailableSpaceTask().execute(); + } + } + + + /** + * Asynchronous task checking if there is space enough to copy all the files chosen + * to upload into the ownCloud local folder. + * + * Maybe an AsyncTask is not strictly necessary, but who really knows. + * + * @author David A. Velasco + */ + private class CheckAvailableSpaceTask extends AsyncTask { + + /** + * Updates the UI before trying the movement + */ + @Override + protected void onPreExecute () { + /// progress dialog and disable 'Move' button + mCurrentDialog = IndeterminateProgressDialog.newInstance(R.string.wait_a_moment, false); + mCurrentDialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG); + } + + + /** + * Checks the available space + * + * @return 'True' if there is space enough. + */ + @Override + protected Boolean doInBackground(Void... params) { + String[] checkedFilePaths = mFileListFragment.getCheckedFilePaths(); + long total = 0; + for (int i=0; checkedFilePaths != null && i < checkedFilePaths.length ; i++) { + String localPath = checkedFilePaths[i]; + File localFile = new File(localPath); + total += localFile.length(); + } + return (FileStorageUtils.getUsableSpace(mAccountOnCreation.name) >= total); + } + + /** + * Updates the activity UI after the check of space is done. + * + * If there is not space enough. shows a new dialog to query the user if wants to move the files instead + * of copy them. + * + * @param result 'True' when there is space enough to copy all the selected files. + */ + @Override + protected void onPostExecute(Boolean result) { + mCurrentDialog.dismiss(); + mCurrentDialog = null; + + if (result) { + // return the list of selected files (success) + Intent data = new Intent(); + data.putExtra(EXTRA_CHOSEN_FILES, mFileListFragment.getCheckedFilePaths()); + setResult(RESULT_OK, data); + finish(); + + } else { + // show a dialog to query the user if wants to move the selected files to the ownCloud folder instead of copying + String[] args = {getString(R.string.app_name)}; + ConfirmationDialogFragment dialog = ConfirmationDialogFragment.newInstance(R.string.upload_query_move_foreign_files, args, R.string.common_yes, -1, R.string.common_no); + dialog.setOnConfirmationListener(UploadFilesActivity.this); + dialog.show(getSupportFragmentManager(), QUERY_TO_MOVE_DIALOG_TAG); + } + } + } + + @Override + public void onConfirmation(String callerTag) { + Log_OC.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag); + if (callerTag.equals(QUERY_TO_MOVE_DIALOG_TAG)) { + // return the list of selected files to the caller activity (success), signaling that they should be moved to the ownCloud folder, instead of copied Intent data = new Intent(); data.putExtra(EXTRA_CHOSEN_FILES, mFileListFragment.getCheckedFilePaths()); - setResult(RESULT_OK, data); + setResult(RESULT_OK_AND_MOVE, data); finish(); } } + + + @Override + public void onNeutral(String callerTag) { + Log_OC.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag); + } + + + @Override + public void onCancel(String callerTag) { + /// nothing to do; don't finish, let the user change the selection + Log_OC.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag); + } + + + @Override + protected void onAccountSet(boolean stateWasRecovered) { + if (getAccount() != null) { + if (!mAccountOnCreation.equals(getAccount())) { + setResult(RESULT_CANCELED); + finish(); + } + + } else { + Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!"); + setResult(RESULT_CANCELED); + finish(); + } + } + }