X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/925a0554e53ac4a35fe17cbed2bf61670a8191f0..3fd56ecff8c7446e9462e43e899360822d3abb91:/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..81841a4d 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -74,14 +74,17 @@ public class FileUploader extends Service implements OnDatatransferProgressListe public static final String EXTRA_UPLOAD_RESULT = "RESULT"; public static final String EXTRA_REMOTE_PATH = "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 +159,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 +170,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 +229,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(); @@ -395,12 +419,14 @@ public class FileUploader extends Service implements OnDatatransferProgressListe private void saveUploadedFile() { OCFile file = mCurrentUpload.getFile(); + /// new PROPFIND to keep data consistent with server in theory, should return the same we already have PropFindMethod propfind = null; RemoteOperationResult result = null; + long syncDate = System.currentTimeMillis(); 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], @@ -408,10 +434,10 @@ public class FileUploader extends Service implements OnDatatransferProgressListe OCFile newFile = fillOCFile(we); newFile.setStoragePath(file.getStoragePath()); newFile.setKeepInSync(file.keepInSync()); + newFile.setLastSyncDateForProperties(syncDate); file = newFile; } else { - // this would be a problem mUploadClient.exhaustResponse(propfind.getResponseBodyAsStream()); } @@ -427,22 +453,22 @@ 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; - } + file.setLastSyncDateForData(syncDate); // this is right, no matter if the PROPFIND was successful or not + + if (!result.isSuccess() && !mCurrentUpload.getRemotePath().equals(file.getRemotePath())) { + // true when the file was automatically renamed to avoid an overwrite ; yes, this is a bit obscure... + OCFile newFile = new OCFile(mCurrentUpload.getRemotePath()); + newFile.setCreationTimestamp(file.getCreationTimestamp()); + newFile.setFileLength(file.getFileLength()); + newFile.setMimetype(file.getMimetype()); + newFile.setModificationTimestamp(file.getModificationTimestamp()); + newFile.setLastSyncDateForProperties(file.getLastSyncDateForProperties()); + newFile.setStoragePath(file.getStoragePath()); + newFile.setKeepInSync(file.keepInSync()); + // newFile.setEtag(file.getEtag()) + file = newFile; } - file.setLastSyncDate(System.currentTimeMillis()); mStorageManager.saveFile(file); } @@ -472,11 +498,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) {