mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 10:18:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: do upload removed files

Browse source
This commit is contained in:
Luke Owncloud 2014-11-16 20:44:17 +01:00
parent 2b85ed59b4
commit 263164a948
2 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/com/owncloud/android/db/UploadDbHandler.java
View file

@ -21,19 +21,16 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Observable;
import com.owncloud.android.MainApp;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.operations.UploadFileOperation;
import com.owncloud.android.ui.adapter.UploadListAdapter;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import com.owncloud.android.MainApp;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;
/**
* Database helper for storing list of files to be uploaded, including status information for each file.
*
@ -63,7 +60,8 @@ public class UploadDbHandler extends Observable {
}
public enum UploadStatus {
UPLOAD_LATER(0), UPLOAD_FAILED(1), UPLOAD_IN_PROGRESS(2), UPLOAD_PAUSED(3), UPLOAD_SUCCEEDED(4);
UPLOAD_LATER(0), UPLOAD_FAILED(1), UPLOAD_IN_PROGRESS(2), UPLOAD_PAUSED(3), UPLOAD_SUCCEEDED(4), UPLOAD_FAILED_GIVE_UP(
5);
private final int value;
private UploadStatus(int value) {
this.value = value;
@ -303,8 +301,8 @@ public class UploadDbHandler extends Observable {
}
public List<UploadDbObject> getAllPendingUploads() {
return getUploads("uploadStatus!=" + UploadStatus.UPLOAD_SUCCEEDED.value, null);
return getUploads("uploadStatus!=" + UploadStatus.UPLOAD_SUCCEEDED.value + " AND uploadStatus!="
+ UploadStatus.UPLOAD_FAILED_GIVE_UP.value, null);
}
}

38
src/com/owncloud/android/files/services/FileUploadService.java
View file

@ -21,7 +21,6 @@ package com.owncloud.android.files.services;
import java.io.File;
import java.io.IOException;
import java.util.AbstractList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -599,6 +598,13 @@ public class FileUploadService extends Service {
return;
}
if (!new File(uploadDbObject.getLocalPath()).exists()) {
mDb.updateUpload(uploadDbObject.getLocalPath(), UploadStatus.UPLOAD_FAILED_GIVE_UP,
new RemoteOperationResult(ResultCode.FILE_NOT_FOUND));
Log_OC.d(TAG, "Do not start upload because local file does not exist.");
return;
}
AccountManager aMgr = AccountManager.get(this);
Account account = uploadDbObject.getAccount(getApplicationContext());
String version = aMgr.getUserData(account, Constants.KEY_OC_VERSION);
@ -896,27 +902,6 @@ public class FileUploadService extends Service {
// grant that future retries on the same account will get the
// fresh credentials
} else {
mNotificationBuilder.setContentText(content);
try {
String message = uploadResult.getLogMessage() + " errorCode: " + uploadResult.getCode();
Log_OC.e(TAG, message + " Http-Code: " + uploadResult.getHttpCode());
if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) {
// message =
// getString(R.string.failed_upload_quota_exceeded_text);
int updatedFiles = mDb.updateFileState(upload.getOriginalStoragePath(),
UploadDbHandler.UploadStatus.UPLOAD_FAILED, message);
if (updatedFiles == 0) { // update failed
mDb.storeFile(upload.getOriginalStoragePath(), upload.getAccount().name, message);
}
} else {
// TODO: handle other results
}
} finally {
}
}
mNotificationBuilder.setContentText(content);
@ -930,7 +915,14 @@ public class FileUploadService extends Service {
NotificationDelayer.cancelWithDelay(mNotificationManager, R.string.uploader_upload_succeeded_ticker,
2000);
} else {
mDb.updateUpload(upload.getOriginalStoragePath(), UploadStatus.UPLOAD_FAILED, uploadResult);
// TODO: add other cases in which upload attempt is to be
// abandoned.
if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) {
mDb.updateUpload(upload.getOriginalStoragePath(),
UploadDbHandler.UploadStatus.UPLOAD_FAILED_GIVE_UP, uploadResult);
} else {
mDb.updateUpload(upload.getOriginalStoragePath(), UploadStatus.UPLOAD_FAILED, uploadResult);
}
}
} else {
mDb.updateUpload(upload.getOriginalStoragePath(), UploadStatus.UPLOAD_FAILED, uploadResult);