mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Moved recursive fetch to notify end-of-syncrhonization of a folder BEFORE its children are synchronized

Browse source
This commit is contained in:
David A. Velasco 2012-10-15 13:14:46 +02:00
parent c7a2866454
commit d6ccd4c960
1 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
View file

@ -184,6 +184,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
private void fetchData(String uri, SyncResult syncResult, long parentId) { private void fetchData(String uri, SyncResult syncResult, long parentId) {
PropFindMethod query = null; PropFindMethod query = null;
Vector<OCFile> children = null;
try { try {
Log.d(TAG, "fetching " + uri); Log.d(TAG, "fetching " + uri);
@ -213,9 +214,6 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
Intent intent = new Intent(this.getContext(), FileDownloader.class); Intent intent = new Intent(this.getContext(), FileDownloader.class);
intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount()); intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());
intent.putExtra(FileDownloader.EXTRA_FILE, file); intent.putExtra(FileDownloader.EXTRA_FILE, file);
/*intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());
intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());
intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());*/
file.setKeepInSync(true); file.setKeepInSync(true);
getContext().startService(intent); getContext().startService(intent);
} }
@ -224,8 +222,6 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
// Log.v(TAG, "adding file: " + file); // Log.v(TAG, "adding file: " + file);
updatedFiles.add(file); updatedFiles.add(file);
if (parentId == 0)
parentId = file.getFileId();
} }
/* Commented code for ugly performance tests /* Commented code for ugly performance tests
long saveDelay = System.currentTimeMillis(); long saveDelay = System.currentTimeMillis();
@ -237,39 +233,21 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
*/ */
// removal of obsolete files // removal of obsolete files
Vector<OCFile> files = getStorageManager().getDirectoryContent( children = getStorageManager().getDirectoryContent(
getStorageManager().getFileById(parentId)); getStorageManager().getFileById(parentId));
OCFile file; OCFile file;
String currentSavePath = FileDownloader.getSavePath(getAccount().name); String currentSavePath = FileDownloader.getSavePath(getAccount().name);
for (int i=0; i < files.size(); ) { for (int i=0; i < children.size(); ) {
file = files.get(i); file = children.get(i);
if (file.getLastSyncDate() != mCurrentSyncTime) { if (file.getLastSyncDate() != mCurrentSyncTime) {
Log.v(TAG, "removing file: " + file); Log.v(TAG, "removing file: " + file);
getStorageManager().removeFile(file, (file.isDown() && file.getStoragePath().startsWith(currentSavePath))); getStorageManager().removeFile(file, (file.isDown() && file.getStoragePath().startsWith(currentSavePath)));
files.remove(i); children.remove(i);
} else { } else {
i++; i++;
} }
} }
// recursive fetch
for (int i=0; i < files.size() && !mCancellation; i++) {
OCFile newFile = files.get(i);
if (newFile.getMimetype().equals("DIR")) {
fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());
}
}
if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancelation request");
/* Commented code for ugly performance tests
mResponseDelays[mDelaysIndex] = responseDelay;
mSaveDelays[mDelaysIndex] = saveDelay;
mDelaysCount++;
mDelaysIndex++;
if (mDelaysIndex >= MAX_DELAYS)
mDelaysIndex = 0;
*/
} else { } else {
syncResult.stats.numAuthExceptions++; syncResult.stats.numAuthExceptions++;
} }
@ -293,8 +271,39 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
// synchronized folder -> notice to UI // synchronized folder -> notice to UI
sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath()); sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath());
} }
fetchChildren(children, syncResult);
if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancelation request");
/* Commented code for ugly performance tests
mResponseDelays[mDelaysIndex] = responseDelay;
mSaveDelays[mDelaysIndex] = saveDelay;
mDelaysCount++;
mDelaysIndex++;
if (mDelaysIndex >= MAX_DELAYS)
mDelaysIndex = 0;
*/
} }
/**
* Synchronize data of folders in the list of received files
*
* @param files Files to recursively fetch
* @param syncResult Updated object to provide results to the Synchronization Manager
*/
private void fetchChildren(Vector<OCFile> files, SyncResult syncResult) {
for (int i=0; i < files.size() && !mCancellation; i++) {
OCFile newFile = files.get(i);
if (newFile.getMimetype().equals("DIR")) {
fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());
}
}
}
private OCFile fillOCFile(WebdavEntry we) { private OCFile fillOCFile(WebdavEntry we) {
OCFile file = new OCFile(we.decodedPath()); OCFile file = new OCFile(we.decodedPath());
file.setCreationTimestamp(we.createTimestamp()); file.setCreationTimestamp(we.createTimestamp());