import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.owncloud.files.services.FileDownloader;\r
import eu.alefzero.owncloud.files.services.FileUploader;\r
+import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
import eu.alefzero.owncloud.utils.OwnCloudVersion;\r
import eu.alefzero.webdav.WebdavClient;\r
break;\r
} \r
case R.id.fdRemoveBtn: {\r
- ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(R.string.confirmation_remove_alert, new String[]{mFile.getFileName()});\r
+ ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(\r
+ R.string.confirmation_remove_alert,\r
+ new String[]{mFile.getFileName()},\r
+ mFile.isDown() ? R.string.confirmation_remove_remote_and_local : R.string.confirmation_remove_remote,\r
+ mFile.isDown() ? R.string.confirmation_remove_local : -1,\r
+ R.string.common_cancel);\r
confDialog.setOnConfirmationListener(this);\r
confDialog.show(getFragmentManager(), FTAG_CONFIRMATION);\r
break;\r
\r
\r
@Override\r
- public void onConfirmation(boolean confirmation, String callerTag) {\r
- if (confirmation && callerTag.equals(FTAG_CONFIRMATION)) {\r
- Log.e("ASD","onConfirmation");\r
+ public void onConfirmation(String callerTag) {\r
+ if (callerTag.equals(FTAG_CONFIRMATION)) {\r
FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
if (fdsm.getFileById(mFile.getFileId()) != null) {\r
new Thread(new RemoveRunnable(mFile, mAccount, new Handler())).start();\r
+ boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+ getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
}\r
- } else if (!confirmation) Log.d(TAG, "REMOVAL CANCELED");\r
+ }\r
+ }\r
+ \r
+ @Override\r
+ public void onNeutral(String callerTag) {\r
+ FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+ File f = null;\r
+ if (mFile.isDown() && (f = new File(mFile.getStoragePath())).exists()) {\r
+ f.delete();\r
+ mFile.setStoragePath(null);\r
+ fdsm.saveFile(mFile);\r
+ updateFileDetails(mFile, mAccount);\r
+ }\r
+ }\r
+ \r
+ @Override\r
+ public void onCancel(String callerTag) {\r
+ Log.d(TAG, "REMOVAL CANCELED");\r
}\r
\r
\r
\r
setButtonsForDown();\r
\r
- // Change download button to open button\r
- /*downloadButton.setText(R.string.filedetails_open);\r
- downloadButton.setOnClickListener(new OnClickListener() {\r
- @Override\r
- public void onClick(View v) {\r
- String storagePath = mFile.getStoragePath();\r
- String encodedStoragePath = WebdavUtils.encodePath(storagePath);\r
- try {\r
- Intent i = new Intent(Intent.ACTION_VIEW);\r
- i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());\r
- i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
- startActivity(i);\r
- \r
- } catch (Throwable t) {\r
- Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());\r
- boolean toastIt = true; \r
- String mimeType = "";\r
- try {\r
- Intent i = new Intent(Intent.ACTION_VIEW);\r
- mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));\r
- if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {\r
- i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);\r
- i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
- startActivity(i);\r
- toastIt = false;\r
- }\r
- \r
- } catch (IndexOutOfBoundsException e) {\r
- Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);\r
- \r
- } catch (ActivityNotFoundException e) {\r
- Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");\r
- \r
- } catch (Throwable th) {\r
- Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);\r
- \r
- } finally {\r
- if (toastIt) {\r
- Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();\r
- }\r
- }\r
- \r
- }\r
- }\r
- });*/\r
} else {\r
setButtonsForRemote();\r
}\r
newFile.setMimetype(mFile.getMimetype());\r
newFile.setModificationTimestamp(mFile.getModificationTimestamp());\r
newFile.setParentId(mFile.getParentId());\r
+ boolean localRenameFails = false;\r
if (mFile.isDown()) {\r
File f = new File(mFile.getStoragePath());\r
Log.e(TAG, f.getAbsolutePath());\r
- f.renameTo(new File(f.getParent() + File.separator + newFilename)); // TODO check if fails\r
+ localRenameFails = !(f.renameTo(new File(f.getParent() + File.separator + newFilename)));\r
Log.e(TAG, f.getParent() + File.separator + newFilename);\r
newFile.setStoragePath(f.getParent() + File.separator + newFilename);\r
}\r
\r
- new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();\r
+ if (localRenameFails) {\r
+ Toast msg = Toast.makeText(getActivity(), R.string.rename_local_fail_msg, Toast.LENGTH_LONG); \r
+ msg.show();\r
+ \r
+ } else {\r
+ new Thread(new RenameRunnable(mFile, newFile, mAccount, new Handler())).start();\r
+ boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+ getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+ }\r
\r
}\r
}\r
LocalMoveMethod move = new LocalMoveMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mOld.getRemotePath()),\r
Uri.parse(baseUrl).getPath() == null ? "" : Uri.parse(baseUrl).getPath() + webdav_path + WebdavUtils.encodePath(mNew.getRemotePath()));\r
\r
+ boolean success = false;\r
try {\r
int status = wc.executeMethod(move);\r
- if (move.succeeded()) {\r
- FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
- fdsm.removeFile(mOld);\r
- fdsm.saveFile(mNew);\r
- mFile = mNew;\r
- mHandler.post(new Runnable() {\r
- @Override\r
- public void run() { \r
- updateFileDetails(mFile, mAccount);\r
- mContainerActivity.onFileStateChanged();\r
- }\r
- });\r
- }\r
- Log.e("ASD", ""+move.getQueryString());\r
- Log.d("move", "returned status " + status);\r
+ success = move.succeeded();\r
+ Log.d(TAG, "Move returned status: " + status);\r
+ \r
} catch (HttpException e) {\r
- // TODO Auto-generated catch block\r
- e.printStackTrace();\r
+ Log.e(TAG, "HTTP Exception renaming file " + mOld.getRemotePath() + " to " + mNew.getRemotePath(), e);\r
+ \r
} catch (IOException e) {\r
- // TODO Auto-generated catch block\r
- e.printStackTrace();\r
+ Log.e(TAG, "I/O Exception renaming file " + mOld.getRemotePath() + " to " + mNew.getRemotePath(), e);\r
+ \r
+ } catch (Exception e) {\r
+ Log.e(TAG, "Unexpected exception renaming file " + mOld.getRemotePath() + " to " + mNew.getRemotePath(), e);\r
+ }\r
+ \r
+ if (success) {\r
+ FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+ fdsm.removeFile(mOld);\r
+ fdsm.saveFile(mNew);\r
+ mFile = mNew;\r
+ mHandler.post(new Runnable() {\r
+ @Override\r
+ public void run() { \r
+ boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+ getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+ updateFileDetails(mFile, mAccount);\r
+ mContainerActivity.onFileStateChanged();\r
+ }\r
+ });\r
+ \r
+ } else {\r
+ mHandler.post(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ // undo the local rename\r
+ if (mNew.isDown()) {\r
+ File f = new File(mNew.getStoragePath());\r
+ if (!f.renameTo(new File(mOld.getStoragePath()))) {\r
+ // the local rename undoing failed; last chance: save the new local storage path in the old file\r
+ mFile.setStoragePath(mNew.getStoragePath());\r
+ FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+ fdsm.saveFile(mFile);\r
+ }\r
+ }\r
+ boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+ getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+ try {\r
+ Toast msg = Toast.makeText(getActivity(), R.string.rename_server_fail_msg, Toast.LENGTH_LONG); \r
+ msg.show();\r
+ \r
+ } catch (NotFoundException e) {\r
+ e.printStackTrace();\r
+ }\r
+ }\r
+ });\r
}\r
}\r
private class LocalMoveMethod extends DavMethodBase {\r
\r
private class RemoveRunnable implements Runnable {\r
\r
- /** Arbitrary timeout for deletion */\r
- public final static int DELETION_TIMEOUT = 5000;\r
- \r
Account mAccount;\r
OCFile mFileToRemove;\r
Handler mHandler;\r
DeleteMethod delete = new DeleteMethod(baseUrl + webdav_path + WebdavUtils.encodePath(mFileToRemove.getRemotePath()));\r
\r
boolean success = false;\r
+ int status = -1;\r
try {\r
- int status = wc.executeMethod(delete, DELETION_TIMEOUT);\r
- if (delete.succeeded()) {\r
- FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
- fdsm.removeFile(mFileToRemove);\r
- mHandler.post(new Runnable() {\r
- @Override\r
- public void run() { \r
- try {\r
- Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);\r
- msg.show();\r
- if (getActivity() instanceof FileDisplayActivity) {\r
- // double pane\r
- FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();\r
- transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
- transaction.commit();\r
- mContainerActivity.onFileStateChanged();\r
- \r
- } else {\r
- getActivity().finish();\r
- }\r
- \r
- } catch (NotFoundException e) {\r
- e.printStackTrace();\r
- }\r
- }\r
- });\r
- success = true;\r
- }\r
- Log.e("ASD", ""+ delete.getQueryString());\r
- Log.d("delete", "returned status " + status);\r
+ status = wc.executeMethod(delete);\r
+ success = (delete.succeeded());\r
+ Log.d(TAG, "Delete: returned status " + status);\r
\r
} catch (HttpException e) {\r
- e.printStackTrace();\r
+ Log.e(TAG, "HTTP Exception removing file " + mFileToRemove.getRemotePath(), e);\r
\r
} catch (IOException e) {\r
- e.printStackTrace();\r
+ Log.e(TAG, "I/O Exception removing file " + mFileToRemove.getRemotePath(), e);\r
\r
- } finally {\r
- if (!success) {\r
- mHandler.post(new Runnable() {\r
- @Override\r
- public void run() {\r
- try {\r
- Toast msg = Toast.makeText(getActivity(), R.string.remove_fail_msg, Toast.LENGTH_LONG); \r
- msg.show();\r
- \r
- } catch (NotFoundException e) {\r
- e.printStackTrace();\r
+ } catch (Exception e) {\r
+ Log.e(TAG, "Unexpected exception removing file " + mFileToRemove.getRemotePath(), e);\r
+ }\r
+ \r
+ if (success) {\r
+ FileDataStorageManager fdsm = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+ fdsm.removeFile(mFileToRemove);\r
+ mHandler.post(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+ getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+ try {\r
+ Toast msg = Toast.makeText(getActivity().getApplicationContext(), R.string.remove_success_msg, Toast.LENGTH_LONG);\r
+ msg.show();\r
+ if (inDisplayActivity) {\r
+ // double pane\r
+ FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();\r
+ transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
+ transaction.commit();\r
+ mContainerActivity.onFileStateChanged();\r
+ \r
+ } else {\r
+ getActivity().finish();\r
}\r
+ \r
+ } catch (NotFoundException e) {\r
+ e.printStackTrace();\r
}\r
- });\r
- }\r
+ }\r
+ });\r
+ \r
+ } else {\r
+ mHandler.post(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
+ getActivity().dismissDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
+ try {\r
+ Toast msg = Toast.makeText(getActivity(), R.string.remove_fail_msg, Toast.LENGTH_LONG); \r
+ msg.show();\r
+ \r
+ } catch (NotFoundException e) {\r
+ e.printStackTrace();\r
+ }\r
+ }\r
+ });\r
}\r
}\r
\r
projects / pub / Android / ownCloud.git / blobdiff