X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1cc6d8c61284f341867ee1d99af2036f805208de..f737785b4f708d2bff23d08bb7dde4ae34ee5533:/src/com/owncloud/android/operations/SynchronizeFolderOperation.java diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index abbd1ba5..088c5788 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -162,13 +162,7 @@ public class SynchronizeFolderOperation extends SyncOperation { } if (mFilesForDirectDownload.isEmpty()) { - // Send a broadcast message for notifying UI update - Intent uiUpdate = new Intent(FileDownloader.getDownloadFinishMessage()); - uiUpdate.putExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, result.isSuccess()); - uiUpdate.putExtra(FileDownloader.ACCOUNT_NAME, mAccount.name); - uiUpdate.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mRemotePath); - uiUpdate.putExtra(FileDownloader.EXTRA_FILE_PATH, mLocalFolder.getRemotePath()); - mContext.sendStickyBroadcast(uiUpdate); + sendBroadcastForNotifyingUIUpdate(result.isSuccess()); } } } catch (OperationCancelledException e) { @@ -221,6 +215,8 @@ public class SynchronizeFolderOperation extends SyncOperation { Log_OC.e(TAG, "Checked " + mAccount.name + mRemotePath + " : " + result.getLogMessage()); } + + sendBroadcastForNotifyingUIUpdate(result.isSuccess()); } return result; @@ -529,6 +525,16 @@ public class SynchronizeFolderOperation extends SyncOperation { } } + private void sendBroadcastForNotifyingUIUpdate(boolean result) { + // Send a broadcast message for notifying UI update + Intent uiUpdate = new Intent(FileDownloader.getDownloadFinishMessage()); + uiUpdate.putExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, result); + uiUpdate.putExtra(FileDownloader.ACCOUNT_NAME, mAccount.name); + uiUpdate.putExtra(FileDownloader.EXTRA_REMOTE_PATH, mRemotePath); + uiUpdate.putExtra(FileDownloader.EXTRA_FILE_PATH, mLocalFolder.getRemotePath()); + mContext.sendStickyBroadcast(uiUpdate); + } + /** * Cancel operation @@ -536,4 +542,12 @@ public class SynchronizeFolderOperation extends SyncOperation { public void cancel() { mCancellationRequested.set(true); } + + public String getFolderPath() { + String path = mLocalFolder.getStoragePath(); + if (path != null && path.length() > 0) { + return path; + } + return FileStorageUtils.getDefaultSavePathFor(mAccount.name, mLocalFolder); + } }