X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dbd981f0121f0e199ea9713c38e736c3f78f838c..00482b6dcb1e98da39df54374f7098b51d66bee5:/src/com/owncloud/android/ui/activity/Uploader.java diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java index bace7c7f..f0e06953 100644 --- a/src/com/owncloud/android/ui/activity/Uploader.java +++ b/src/com/owncloud/android/ui/activity/Uploader.java @@ -1,6 +1,10 @@ -/* ownCloud Android client application +/** + * ownCloud Android client application + * + * @author Bartek Przybylski + * @author masensio * Copyright (C) 2012 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -26,13 +30,6 @@ import java.util.List; import java.util.Stack; import java.util.Vector; -import com.owncloud.android.MainApp; -import com.owncloud.android.R; -import com.owncloud.android.authentication.AccountAuthenticator; -import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.lib.common.utils.Log_OC; import android.accounts.Account; import android.accounts.AccountManager; @@ -46,60 +43,67 @@ import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Resources.NotFoundException; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.Parcelable; import android.preference.PreferenceManager; +import android.provider.MediaStore; import android.provider.MediaStore.Audio; import android.provider.MediaStore.Images; import android.provider.MediaStore.Video; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.ActionBar; +import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.Button; import android.widget.EditText; +import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.Toast; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockListActivity; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.AccountAuthenticator; -import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.lib.common.utils.Log_OC; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Stack; -import java.util.Vector; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.operations.CreateFolderOperation; +import com.owncloud.android.ui.dialog.CreateFolderDialogFragment; +import com.owncloud.android.ui.dialog.LoadingDialog; +import com.owncloud.android.utils.CopyTmpFileAsyncTask; +import com.owncloud.android.utils.DisplayUtils; +import com.owncloud.android.utils.ErrorMessageAdapter; /** * This can be used to upload things to an ownCloud instance. - * - * @author Bartek Przybylski - * */ -public class Uploader extends SherlockListActivity implements OnItemClickListener, android.view.View.OnClickListener { - private static final String TAG = "ownCloudUploader"; +public class Uploader extends FileActivity + implements OnItemClickListener, android.view.View.OnClickListener, + CopyTmpFileAsyncTask.OnCopyTmpFileTaskListener { + + private static final String TAG = Uploader.class.getSimpleName(); - private Account mAccount; private AccountManager mAccountManager; private Stack mParents; private ArrayList mStreamsToUpload; private boolean mCreateDir; private String mUploadPath; - private FileDataStorageManager mStorageManager; private OCFile mFile; + private boolean mAccountSelected; + private boolean mAccountSelectionShowing; + private ArrayList mRemoteCacheData; + private int mNumCacheFile; + private final static int DIALOG_NO_ACCOUNT = 0; private final static int DIALOG_WAITING = 1; private final static int DIALOG_NO_STREAM = 2; @@ -107,36 +111,96 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene private final static int REQUEST_CODE_SETUP_ACCOUNT = 0; + private final static String KEY_PARENTS = "PARENTS"; + private final static String KEY_FILE = "FILE"; + private final static String KEY_ACCOUNT_SELECTED = "ACCOUNT_SELECTED"; + private final static String KEY_ACCOUNT_SELECTION_SHOWING = "ACCOUNT_SELECTION_SHOWING"; + private final static String KEY_NUM_CACHE_FILE = "NUM_CACHE_FILE"; + private final static String KEY_REMOTE_CACHE_DATA = "REMOTE_CACHE_DATA"; + + private static final String DIALOG_WAIT_COPY_FILE = "DIALOG_WAIT_COPY_FILE"; + @Override protected void onCreate(Bundle savedInstanceState) { + prepareStreamsToUpload(); + + if (savedInstanceState == null) { + mParents = new Stack(); + mAccountSelected = false; + mAccountSelectionShowing = false; + mNumCacheFile = 0; + + // ArrayList for files with path in private storage + mRemoteCacheData = new ArrayList(); + } else { + mParents = (Stack) savedInstanceState.getSerializable(KEY_PARENTS); + mFile = savedInstanceState.getParcelable(KEY_FILE); + mAccountSelected = savedInstanceState.getBoolean(KEY_ACCOUNT_SELECTED); + mAccountSelectionShowing = savedInstanceState.getBoolean(KEY_ACCOUNT_SELECTION_SHOWING); + mNumCacheFile = savedInstanceState.getInt(KEY_NUM_CACHE_FILE); + mRemoteCacheData = savedInstanceState.getStringArrayList(KEY_REMOTE_CACHE_DATA); + } + super.onCreate(savedInstanceState); - mParents = new Stack(); + + if (mAccountSelected) { + setAccount((Account) savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT)); + } + ActionBar actionBar = getSupportActionBar(); actionBar.setIcon(DisplayUtils.getSeasonalIconId()); - if (prepareStreamsToUpload()) { + } + + @Override + protected void setAccount(Account account, boolean savedAccount) { + if (somethingToUpload()) { mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE); Account[] accounts = mAccountManager.getAccountsByType(MainApp.getAccountType()); if (accounts.length == 0) { Log_OC.i(TAG, "No ownCloud account is available"); showDialog(DIALOG_NO_ACCOUNT); - } else if (accounts.length > 1) { - Log_OC.i(TAG, "More then one ownCloud is available"); + } else if (accounts.length > 1 && !mAccountSelected && !mAccountSelectionShowing) { + Log_OC.i(TAG, "More than one ownCloud is available"); showDialog(DIALOG_MULTIPLE_ACCOUNT); + mAccountSelectionShowing = true; } else { - mAccount = accounts[0]; - mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); - initTargetFolder(); - populateDirectoryList(); - + if (!savedAccount) { + setAccount(accounts[0]); + } } - + } else { showDialog(DIALOG_NO_STREAM); } + + super.setAccount(account, savedAccount); } - + + @Override + protected void onAccountSet(boolean stateWasRecovered) { + super.onAccountSet(mAccountWasRestored); + initTargetFolder(); + populateDirectoryList(); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + Log_OC.d(TAG, "onSaveInstanceState() start"); + super.onSaveInstanceState(outState); + outState.putSerializable(KEY_PARENTS, mParents); + //outState.putParcelable(KEY_ACCOUNT, mAccount); + outState.putParcelable(KEY_FILE, mFile); + outState.putBoolean(KEY_ACCOUNT_SELECTED, mAccountSelected); + outState.putBoolean(KEY_ACCOUNT_SELECTION_SHOWING, mAccountSelectionShowing); + outState.putInt(KEY_NUM_CACHE_FILE, mNumCacheFile); + outState.putStringArrayList(KEY_REMOTE_CACHE_DATA, mRemoteCacheData); + outState.putParcelable(FileActivity.EXTRA_ACCOUNT, getAccount()); + + Log_OC.d(TAG, "onSaveInstanceState() end"); + } + @Override protected Dialog onCreateDialog(final int id) { final AlertDialog.Builder builder = new Builder(this); @@ -150,12 +214,14 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene case DIALOG_NO_ACCOUNT: builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setTitle(R.string.uploader_wrn_no_account_title); - builder.setMessage(String.format(getString(R.string.uploader_wrn_no_account_text), getString(R.string.app_name))); + builder.setMessage(String.format( + getString(R.string.uploader_wrn_no_account_text), getString(R.string.app_name))); builder.setCancelable(false); builder.setPositiveButton(R.string.uploader_wrn_no_account_setup_btn_text, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.ECLAIR_MR1) { + if (android.os.Build.VERSION.SDK_INT > + android.os.Build.VERSION_CODES.ECLAIR_MR1) { // using string value since in API7 this // constatn is not defined // in API7 < this constatant is defined in @@ -183,24 +249,28 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene }); return builder.create(); case DIALOG_MULTIPLE_ACCOUNT: - CharSequence ac[] = new CharSequence[mAccountManager.getAccountsByType(MainApp.getAccountType()).length]; + CharSequence ac[] = new CharSequence[ + mAccountManager.getAccountsByType(MainApp.getAccountType()).length]; for (int i = 0; i < ac.length; ++i) { - ac[i] = mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name; + ac[i] = DisplayUtils.convertIdn( + mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name, false); } builder.setTitle(R.string.common_choose_account); builder.setItems(ac, new OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - mAccount = mAccountManager.getAccountsByType(MainApp.getAccountType())[which]; - mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); - initTargetFolder(); - populateDirectoryList(); + setAccount(mAccountManager.getAccountsByType(MainApp.getAccountType())[which]); + onAccountSet(mAccountWasRestored); + dialog.dismiss(); + mAccountSelected = true; + mAccountSelectionShowing = false; } }); builder.setCancelable(true); builder.setOnCancelListener(new OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { + mAccountSelectionShowing = false; dialog.cancel(); finish(); } @@ -256,7 +326,8 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene public void onItemClick(AdapterView parent, View view, int position, long id) { // click on folder in the list Log_OC.d(TAG, "on item click"); - Vector tmpfiles = mStorageManager.getFolderContent(mFile); + // TODO Enable when "On Device" is recovered ? + Vector tmpfiles = getStorageManager().getFolderContent(mFile /*, false*/); if (tmpfiles.size() <= 0) return; // filter on dirtype Vector files = new Vector(); @@ -275,7 +346,8 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene // click on button switch (v.getId()) { case R.id.uploader_choose_folder: - mUploadPath = ""; // first element in mParents is root dir, represented by ""; init mUploadPath with "/" results in a "//" prefix + mUploadPath = ""; // first element in mParents is root dir, represented by ""; + // init mUploadPath with "/" results in a "//" prefix for (String p : mParents) mUploadPath += p + OCFile.PATH_SEPARATOR; Log_OC.d(TAG, "Uploading file to dir " + mUploadPath); @@ -283,6 +355,13 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene uploadFiles(); break; + + case R.id.uploader_new_folder: + CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(mFile); + dialog.show(getSupportFragmentManager(), "createdirdialog"); + break; + + default: throw new IllegalArgumentException("Wrong element clicked"); } @@ -304,7 +383,7 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene // there is no need for checking for is there more then one // account at this point // since account setup can set only one account at time - mAccount = accounts[0]; + setAccount(accounts[0]); populateDirectoryList(); } } @@ -312,6 +391,8 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene private void populateDirectoryList() { setContentView(R.layout.uploader_layout); + + ListView mListView = (ListView) findViewById(android.R.id.list); String current_dir = mParents.peek(); if(current_dir.equals("")){ @@ -320,14 +401,19 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene else{ getSupportActionBar().setTitle(current_dir); } + boolean notRoot = (mParents.size() > 1); + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayHomeAsUpEnabled(notRoot); + actionBar.setHomeButtonEnabled(notRoot); String full_path = generatePath(mParents); - + Log_OC.d(TAG, "Populating view with content of : " + full_path); - mFile = mStorageManager.getFileByPath(full_path); + mFile = getStorageManager().getFileByPath(full_path); if (mFile != null) { - Vector files = mStorageManager.getFolderContent(mFile); + // TODO Enable when "On Device" is recovered ? + Vector files = getStorageManager().getFolderContent(mFile/*, false*/); List> data = new LinkedList>(); for (OCFile f : files) { HashMap h = new HashMap(); @@ -340,11 +426,16 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene data, R.layout.uploader_list_item_layout, new String[] {"dirname"}, - new int[] {R.id.textView1}); - setListAdapter(sa); - Button btn = (Button) findViewById(R.id.uploader_choose_folder); - btn.setOnClickListener(this); - getListView().setOnItemClickListener(this); + new int[] {R.id.filename}); + + mListView.setAdapter(sa); + Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder); + btnChooseFolder.setOnClickListener(this); + + Button btnNewFolder = (Button) findViewById(R.id.uploader_new_folder); + btnNewFolder.setOnClickListener(this); + + mListView.setOnItemClickListener(this); } } @@ -356,19 +447,23 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene return full_path; } - private boolean prepareStreamsToUpload() { + private void prepareStreamsToUpload() { if (getIntent().getAction().equals(Intent.ACTION_SEND)) { mStreamsToUpload = new ArrayList(); mStreamsToUpload.add(getIntent().getParcelableExtra(Intent.EXTRA_STREAM)); } else if (getIntent().getAction().equals(Intent.ACTION_SEND_MULTIPLE)) { mStreamsToUpload = getIntent().getParcelableArrayListExtra(Intent.EXTRA_STREAM); } + } + + private boolean somethingToUpload() { return (mStreamsToUpload != null && mStreamsToUpload.get(0) != null); } public void uploadFiles() { try { + // ArrayList for files with path in external storage ArrayList local = new ArrayList(); ArrayList remote = new ArrayList(); @@ -376,101 +471,162 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene for (Parcelable mStream : mStreamsToUpload) { Uri uri = (Uri) mStream; - if (uri !=null) { + String data = null; + String filePath = ""; + + if (uri != null) { if (uri.getScheme().equals("content")) { - - String mimeType = getContentResolver().getType(uri); - - if (mimeType.contains("image")) { - String[] CONTENT_PROJECTION = { Images.Media.DATA, Images.Media.DISPLAY_NAME, Images.Media.MIME_TYPE, Images.Media.SIZE}; - Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null); - c.moveToFirst(); - int index = c.getColumnIndex(Images.Media.DATA); - String data = c.getString(index); - local.add(data); - remote.add(mUploadPath + c.getString(c.getColumnIndex(Images.Media.DISPLAY_NAME))); - - } - else if (mimeType.contains("video")) { - String[] CONTENT_PROJECTION = { Video.Media.DATA, Video.Media.DISPLAY_NAME, Video.Media.MIME_TYPE, Video.Media.SIZE, Video.Media.DATE_MODIFIED }; - Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null); - c.moveToFirst(); - int index = c.getColumnIndex(Video.Media.DATA); - String data = c.getString(index); - local.add(data); - remote.add(mUploadPath + c.getString(c.getColumnIndex(Video.Media.DISPLAY_NAME))); + String mimeType = getContentResolver().getType(uri); + + if (mimeType.contains("image")) { + String[] CONTENT_PROJECTION = { Images.Media.DATA, + Images.Media.DISPLAY_NAME, Images.Media.MIME_TYPE, + Images.Media.SIZE }; + Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, + null, null); + c.moveToFirst(); + int index = c.getColumnIndex(Images.Media.DATA); + data = c.getString(index); + filePath = mUploadPath + + c.getString(c.getColumnIndex(Images.Media.DISPLAY_NAME)); + + } else if (mimeType.contains("video")) { + String[] CONTENT_PROJECTION = { Video.Media.DATA, + Video.Media.DISPLAY_NAME, Video.Media.MIME_TYPE, + Video.Media.SIZE, Video.Media.DATE_MODIFIED }; + Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, + null, null); + c.moveToFirst(); + int index = c.getColumnIndex(Video.Media.DATA); + data = c.getString(index); + filePath = mUploadPath + + c.getString(c.getColumnIndex(Video.Media.DISPLAY_NAME)); - } - else if (mimeType.contains("audio")) { - String[] CONTENT_PROJECTION = { Audio.Media.DATA, Audio.Media.DISPLAY_NAME, Audio.Media.MIME_TYPE, Audio.Media.SIZE }; - Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null); - c.moveToFirst(); - int index = c.getColumnIndex(Audio.Media.DATA); - String data = c.getString(index); - local.add(data); - remote.add(mUploadPath + c.getString(c.getColumnIndex(Audio.Media.DISPLAY_NAME))); - - } - else { - String filePath = Uri.decode(uri.toString()).replace(uri.getScheme() + "://", ""); - // cut everything whats before mnt. It occured to me that sometimes apps send their name into the URI - if (filePath.contains("mnt")) { - String splitedFilePath[] = filePath.split("/mnt"); - filePath = splitedFilePath[1]; - } - final File file = new File(filePath); - local.add(file.getAbsolutePath()); - remote.add(mUploadPath + file.getName()); - } - + } else if (mimeType.contains("audio")) { + String[] CONTENT_PROJECTION = { Audio.Media.DATA, + Audio.Media.DISPLAY_NAME, Audio.Media.MIME_TYPE, + Audio.Media.SIZE }; + Cursor c = getContentResolver().query(uri, CONTENT_PROJECTION, null, + null, null); + c.moveToFirst(); + int index = c.getColumnIndex(Audio.Media.DATA); + data = c.getString(index); + filePath = mUploadPath + + c.getString(c.getColumnIndex(Audio.Media.DISPLAY_NAME)); + + } else { + Cursor cursor = getContentResolver().query(uri, + new String[]{MediaStore.MediaColumns.DISPLAY_NAME}, + null, null, null); + cursor.moveToFirst(); + int nameIndex = cursor.getColumnIndex(cursor.getColumnNames()[0]); + if (nameIndex >= 0) { + filePath = mUploadPath + cursor.getString(nameIndex); + } + } + } else if (uri.getScheme().equals("file")) { - String filePath = Uri.decode(uri.toString()).replace(uri.getScheme() + "://", ""); + filePath = Uri.decode(uri.toString()).replace(uri.getScheme() + + "://", ""); if (filePath.contains("mnt")) { String splitedFilePath[] = filePath.split("/mnt"); filePath = splitedFilePath[1]; } final File file = new File(filePath); - local.add(file.getAbsolutePath()); - remote.add(mUploadPath + file.getName()); + data = file.getAbsolutePath(); + filePath = mUploadPath + file.getName(); } else { throw new SecurityException(); } + if (data == null) { + mRemoteCacheData.add(filePath); + CopyTmpFileAsyncTask copyTask = new CopyTmpFileAsyncTask(this); + Object[] params = { uri, filePath, mRemoteCacheData.size()-1, + getAccount().name, getContentResolver()}; + mNumCacheFile++; + showWaitingCopyDialog(); + copyTask.execute(params); + } else { + remote.add(filePath); + local.add(data); + } } else { throw new SecurityException(); } - - Intent intent = new Intent(getApplicationContext(), FileUploader.class); - intent.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES); - intent.putExtra(FileUploader.KEY_LOCAL_FILE, local.toArray(new String[local.size()])); - intent.putExtra(FileUploader.KEY_REMOTE_FILE, remote.toArray(new String[remote.size()])); - intent.putExtra(FileUploader.KEY_ACCOUNT, mAccount); - startService(intent); - //Save the path to shared preferences - SharedPreferences.Editor appPrefs = PreferenceManager - .getDefaultSharedPreferences(getApplicationContext()).edit(); - appPrefs.putString("last_upload_path", mUploadPath); - appPrefs.apply(); + Intent intent = new Intent(getApplicationContext(), FileUploader.class); + intent.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES); + intent.putExtra(FileUploader.KEY_LOCAL_FILE, local.toArray(new String[local.size()])); + intent.putExtra(FileUploader.KEY_REMOTE_FILE, + remote.toArray(new String[remote.size()])); + intent.putExtra(FileUploader.KEY_ACCOUNT, getAccount()); + startService(intent); - finish(); + //Save the path to shared preferences + SharedPreferences.Editor appPrefs = PreferenceManager + .getDefaultSharedPreferences(getApplicationContext()).edit(); + appPrefs.putString("last_upload_path", mUploadPath); + appPrefs.apply(); + + finish(); } } catch (SecurityException e) { - String message = String.format(getString(R.string.uploader_error_forbidden_content), getString(R.string.app_name)); + String message = String.format(getString(R.string.uploader_error_forbidden_content), + getString(R.string.app_name)); Toast.makeText(this, message, Toast.LENGTH_LONG).show(); } } + @Override + public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) { + super.onRemoteOperationFinish(operation, result); + + + if (operation instanceof CreateFolderOperation) { + onCreateFolderOperationFinish((CreateFolderOperation)operation, result); + } + + } + + /** + * Updates the view associated to the activity after the finish of an operation + * trying create a new folder + * + * @param operation Creation operation performed. + * @param result Result of the creation. + */ + private void onCreateFolderOperationFinish(CreateFolderOperation operation, + RemoteOperationResult result) { + if (result.isSuccess()) { + dismissLoadingDialog(); + populateDirectoryList(); + } else { + dismissLoadingDialog(); + try { + Toast msg = Toast.makeText(this, + ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()), + Toast.LENGTH_LONG); + msg.show(); + + } catch (NotFoundException e) { + Log_OC.e(TAG, "Error while trying to show fail message " , e); + } + } + } + + /** * Loads the target folder initialize shown to the user. * * The target account has to be chosen before this method is called. */ private void initTargetFolder() { - if (mStorageManager == null) { - throw new IllegalStateException("Do not call this method before initializing mStorageManager"); + if (getStorageManager() == null) { + throw new IllegalStateException("Do not call this method before " + + "initializing mStorageManager"); } SharedPreferences appPreferences = PreferenceManager @@ -480,18 +636,84 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene // "/" equals root-directory if(last_path.equals("/")) { mParents.add(""); - } - else{ + } else{ String[] dir_names = last_path.split("/"); + mParents.clear(); for (String dir : dir_names) mParents.add(dir); } //Make sure that path still exists, if it doesn't pop the stack and try the previous path - while(!mStorageManager.fileExists(generatePath(mParents))){ + while(!getStorageManager().fileExists(generatePath(mParents)) && mParents.size() > 1){ mParents.pop(); } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + boolean retval = true; + switch (item.getItemId()) { + case android.R.id.home: + if((mParents.size() > 1)) { + onBackPressed(); + } + break; + + default: + retval = super.onOptionsItemSelected(item); + } + return retval; + } + + + /** + * Process the result of CopyTmpFileAsyncTask + * @param result + * @param index + */ + @Override + public void onTmpFileCopied(String result, int index) { + if (mNumCacheFile -- == 0) { + dismissWaitingCopyDialog(); + } + if (result != null) { + Intent intent = new Intent(getApplicationContext(), FileUploader.class); + intent.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE); + intent.putExtra(FileUploader.KEY_LOCAL_FILE, result); + intent.putExtra(FileUploader.KEY_REMOTE_FILE, mRemoteCacheData.get(index)); + intent.putExtra(FileUploader.KEY_ACCOUNT, getAccount()); + startService(intent); + } else { + String message = String.format(getString(R.string.uploader_error_forbidden_content), + getString(R.string.app_name)); + Toast.makeText(this, message, Toast.LENGTH_LONG).show(); + Log_OC.d(TAG, message); + } + + } +/** + * Show waiting for copy dialog + */ + public void showWaitingCopyDialog() { + // Construct dialog + LoadingDialog loading = new LoadingDialog( + getResources().getString(R.string.wait_for_tmp_copy_from_private_storage)); + FragmentManager fm = getSupportFragmentManager(); + FragmentTransaction ft = fm.beginTransaction(); + loading.show(ft, DIALOG_WAIT_COPY_FILE); + + } + + + /** + * Dismiss waiting for copy dialog + */ + public void dismissWaitingCopyDialog(){ + Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_COPY_FILE); + if (frag != null) { + LoadingDialog loading = (LoadingDialog) frag; + loading.dismiss(); + } + } }