X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/925a0554e53ac4a35fe17cbed2bf61670a8191f0..38a80be828c9b10166df586e2c77d357030477a9:/src/com/owncloud/android/files/services/FileUploader.java diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index c8916ef2..87dc1775 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -38,6 +38,7 @@ import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.UploadFileOperation; import com.owncloud.android.ui.activity.FileDetailActivity; import com.owncloud.android.ui.fragment.FileDetailFragment; +import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.OwnCloudVersion; import eu.alefzero.webdav.OnDatatransferProgressListener; @@ -73,15 +74,19 @@ public class FileUploader extends Service implements OnDatatransferProgressListe public static final String EXTRA_PARENT_DIR_ID = "PARENT_DIR_ID"; public static final String EXTRA_UPLOAD_RESULT = "RESULT"; public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH"; + public static final String EXTRA_OLD_REMOTE_PATH = "OLD_REMOTE_PATH"; public static final String EXTRA_FILE_PATH = "FILE_PATH"; + public static final String ACCOUNT_NAME = "ACCOUNT_NAME"; - public static final String KEY_LOCAL_FILE = "LOCAL_FILE"; - public static final String KEY_REMOTE_FILE = "REMOTE_FILE"; + public static final String KEY_FILE = "FILE"; + public static final String KEY_LOCAL_FILE = "LOCAL_FILE"; // TODO remove this as a possible input argument ; use KEY_FILE everywhere + public static final String KEY_REMOTE_FILE = "REMOTE_FILE"; // TODO remove this as a possible input argument ; use KEY_FILE everywhere + public static final String KEY_MIME_TYPE = "MIME_TYPE"; + public static final String KEY_ACCOUNT = "ACCOUNT"; + public static final String KEY_UPLOAD_TYPE = "UPLOAD_TYPE"; public static final String KEY_FORCE_OVERWRITE = "KEY_FORCE_OVERWRITE"; - public static final String ACCOUNT_NAME = "ACCOUNT_NAME"; - public static final String KEY_MIME_TYPE = "MIME_TYPE"; public static final String KEY_INSTANT_UPLOAD = "INSTANT_UPLOAD"; public static final int UPLOAD_SINGLE_FILE = 0; @@ -156,7 +161,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe */ @Override public int onStartCommand(Intent intent, int flags, int startId) { - if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE)) { + if (!intent.hasExtra(KEY_ACCOUNT) || !intent.hasExtra(KEY_UPLOAD_TYPE) || !(intent.hasExtra(KEY_LOCAL_FILE) || intent.hasExtra(KEY_FILE))) { Log.e(TAG, "Not enough information provided in intent"); return Service.START_NOT_STICKY; } @@ -167,33 +172,57 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } Account account = intent.getParcelableExtra(KEY_ACCOUNT); - String[] localPaths, remotePaths, mimeTypes; + String[] localPaths = null, remotePaths = null, mimeTypes = null; + OCFile[] files = null; if (uploadType == UPLOAD_SINGLE_FILE) { - localPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) }; - remotePaths = new String[] { intent - .getStringExtra(KEY_REMOTE_FILE) }; - mimeTypes = new String[] { intent.getStringExtra(KEY_MIME_TYPE) }; + + if (intent.hasExtra(KEY_FILE)) { + files = new OCFile[] {intent.getParcelableExtra(KEY_FILE) }; + + } else { + localPaths = new String[] { intent.getStringExtra(KEY_LOCAL_FILE) }; + remotePaths = new String[] { intent.getStringExtra(KEY_REMOTE_FILE) }; + mimeTypes = new String[] { intent.getStringExtra(KEY_MIME_TYPE) }; + } } else { // mUploadType == UPLOAD_MULTIPLE_FILES - localPaths = intent.getStringArrayExtra(KEY_LOCAL_FILE); - remotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE); - mimeTypes = intent.getStringArrayExtra(KEY_MIME_TYPE); + + if (intent.hasExtra(KEY_FILE)) { + files = (OCFile[]) intent.getParcelableArrayExtra(KEY_FILE); // TODO will this casting work fine? + + } else { + localPaths = intent.getStringArrayExtra(KEY_LOCAL_FILE); + remotePaths = intent.getStringArrayExtra(KEY_REMOTE_FILE); + mimeTypes = intent.getStringArrayExtra(KEY_MIME_TYPE); + } } - if (localPaths == null) { - Log.e(TAG, "Incorrect array for local paths provided in upload intent"); - return Service.START_NOT_STICKY; - } - if (remotePaths == null) { - Log.e(TAG, "Incorrect array for remote paths provided in upload intent"); + FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver()); + + if (intent.hasExtra(KEY_FILE) && files == null) { + Log.e(TAG, "Incorrect array for OCFiles provided in upload intent"); return Service.START_NOT_STICKY; - } - if (localPaths.length != remotePaths.length) { - Log.e(TAG, "Different number of remote paths and local paths!"); - return Service.START_NOT_STICKY; + } else if (!intent.hasExtra(KEY_FILE)) { + if (localPaths == null) { + Log.e(TAG, "Incorrect array for local paths provided in upload intent"); + return Service.START_NOT_STICKY; + } + if (remotePaths == null) { + Log.e(TAG, "Incorrect array for remote paths provided in upload intent"); + return Service.START_NOT_STICKY; + } + if (localPaths.length != remotePaths.length) { + Log.e(TAG, "Different number of remote paths and local paths!"); + return Service.START_NOT_STICKY; + } + + files = new OCFile[localPaths.length]; + for (int i=0; i < localPaths.length; i++) { + files[i] = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes!=null)?mimeTypes[i]:(String)null), storageManager); + } } - + boolean isInstant = intent.getBooleanExtra(KEY_INSTANT_UPLOAD, false); boolean forceOverwrite = intent.getBooleanExtra(KEY_FORCE_OVERWRITE, false); @@ -202,20 +231,17 @@ public class FileUploader extends Service implements OnDatatransferProgressListe AbstractList requestedUploads = new Vector(); String uploadKey = null; UploadFileOperation newUpload = null; - OCFile file = null; - FileDataStorageManager storageManager = new FileDataStorageManager(account, getContentResolver()); boolean fixed = false; if (isInstant) { fixed = checkAndFixInstantUploadDirectory(storageManager); } try { - for (int i=0; i < localPaths.length; i++) { - uploadKey = buildRemoteName(account, remotePaths[i]); - file = obtainNewOCFileToUpload(remotePaths[i], localPaths[i], ((mimeTypes!=null)?mimeTypes[i]:(String)null), isInstant, forceOverwrite, storageManager); + for (int i=0; i < files.length; i++) { + uploadKey = buildRemoteName(account, files[i].getRemotePath()); if (chunked) { - newUpload = new ChunkedUploadFileOperation(account, file, isInstant, forceOverwrite); + newUpload = new ChunkedUploadFileOperation(account, files[i], isInstant, forceOverwrite); } else { - newUpload = new UploadFileOperation(account, file, isInstant, forceOverwrite); + newUpload = new UploadFileOperation(account, files[i], isInstant, forceOverwrite); } if (fixed && i==0) { newUpload.setRemoteFolderToBeCreated(); @@ -394,24 +420,24 @@ public class FileUploader extends Service implements OnDatatransferProgressListe */ private void saveUploadedFile() { OCFile file = mCurrentUpload.getFile(); + long syncDate = System.currentTimeMillis(); + file.setLastSyncDateForData(syncDate); + /// new PROPFIND to keep data consistent with server in theory, should return the same we already have PropFindMethod propfind = null; RemoteOperationResult result = null; try { propfind = new PropFindMethod(mUploadClient.getBaseUri() + WebdavUtils.encodePath(mCurrentUpload.getRemotePath())); int status = mUploadClient.executeMethod(propfind); - boolean isMultiStatus = status == HttpStatus.SC_MULTI_STATUS; + boolean isMultiStatus = (status == HttpStatus.SC_MULTI_STATUS); if (isMultiStatus) { MultiStatus resp = propfind.getResponseBodyAsMultiStatus(); WebdavEntry we = new WebdavEntry(resp.getResponses()[0], mUploadClient.getBaseUri().getPath()); - OCFile newFile = fillOCFile(we); - newFile.setStoragePath(file.getStoragePath()); - newFile.setKeepInSync(file.keepInSync()); - file = newFile; + updateOCFile(file, we); + file.setLastSyncDateForProperties(syncDate); } else { - // this would be a problem mUploadClient.exhaustResponse(propfind.getResponseBodyAsStream()); } @@ -427,34 +453,47 @@ public class FileUploader extends Service implements OnDatatransferProgressListe propfind.releaseConnection(); } - if (!result.isSuccess()) { - // file was successfully uploaded, but the new time stamp and Etag in the server could not be read; - // just keeping old values :( - if (!mCurrentUpload.getRemotePath().equals(file.getRemotePath())) { - // true when the file was automatically renamed to avoid an overwrite - OCFile newFile = new OCFile(mCurrentUpload.getRemotePath()); - newFile.setCreationTimestamp(file.getCreationTimestamp()); - newFile.setFileLength(file.getFileLength()); - newFile.setMimetype(file.getMimetype()); - newFile.setModificationTimestamp(file.getModificationTimestamp()); // this is specially BAD - // newFile.setEtag(file.getEtag()) // TODO and this is still worse - file = newFile; + + if (mCurrentUpload.wasRenamed()) { + OCFile oldFile = mCurrentUpload.getOldFile(); + if (!oldFile.fileExists()) { + // just a name coincidence + file.setStoragePath(oldFile.getStoragePath()); + + } else { + // conflict resolved with 'Keep both' by the user + File localFile = new File(oldFile.getStoragePath()); + File newLocalFile = new File(FileStorageUtils.getDefaultSavePathFor(mCurrentUpload.getAccount().name, file)); + boolean renameSuccessed = localFile.renameTo(newLocalFile); + if (renameSuccessed) { + file.setStoragePath(newLocalFile.getAbsolutePath()); + + } else { + // poor solution + Log.d(TAG, "DAMN IT: local rename failed after uploading a file with a new name already existing both in the remote account and the local database (should be due to a conflict solved with 'keep both'"); + file.setStoragePath(null); + // not so fine: + // - local file will be kept there as 'trash' until is download (and overwritten) again from the server; + // - user will see as 'not down' a file that was just upload + // BUT: + // - no loss of data happened + // - when the user downloads again the renamed and original file from the server, local file names and contents will be correctly synchronized with names and contents in server + } + oldFile.setStoragePath(null); + mStorageManager.saveFile(oldFile); } } - file.setLastSyncDate(System.currentTimeMillis()); mStorageManager.saveFile(file); } - private OCFile fillOCFile(WebdavEntry we) { - OCFile file = new OCFile(we.decodedPath()); + private void updateOCFile(OCFile file, WebdavEntry we) { file.setCreationTimestamp(we.createTimestamp()); file.setFileLength(we.contentLength()); file.setMimetype(we.contentType()); file.setModificationTimestamp(we.modifiedTimesamp()); // file.setEtag(mCurrentDownload.getEtag()); // TODO Etag, where available - return file; } @@ -472,11 +511,11 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } - private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType, boolean isInstant, boolean forceOverwrite, FileDataStorageManager storageManager) { + private OCFile obtainNewOCFileToUpload(String remotePath, String localPath, String mimeType, FileDataStorageManager storageManager) { OCFile newFile = new OCFile(remotePath); newFile.setStoragePath(localPath); - newFile.setLastSyncDate(0); - newFile.setKeepInSync(forceOverwrite); + newFile.setLastSyncDateForProperties(0); + newFile.setLastSyncDateForData(0); // size if (localPath != null && localPath.length() > 0) { @@ -636,6 +675,9 @@ public class FileUploader extends Service implements OnDatatransferProgressListe private void sendFinalBroadcast(UploadFileOperation upload, RemoteOperationResult uploadResult) { Intent end = new Intent(UPLOAD_FINISH_MESSAGE); end.putExtra(EXTRA_REMOTE_PATH, upload.getRemotePath()); // real remote path, after possible automatic renaming + if (upload.wasRenamed()) { + end.putExtra(EXTRA_OLD_REMOTE_PATH, upload.getOldFile().getRemotePath()); + } end.putExtra(EXTRA_FILE_PATH, upload.getStoragePath()); end.putExtra(ACCOUNT_NAME, upload.getAccount().name); end.putExtra(EXTRA_UPLOAD_RESULT, uploadResult.isSuccess());