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

Show all uploads

Browse source
This commit is contained in:
Mario Danic 2017-02-24 13:25:39 +01:00 committed by AndyScherzinger
parent 316554f5a5
commit aa10589e55
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/com/owncloud/android/datamodel/UploadsStorageManager.java
View file

@ -382,7 +382,6 @@ public class UploadsStorageManager extends Observable {
Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext); Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
OCUpload[] uploads = getUploads( OCUpload[] uploads = getUploads(
ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " +
ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value + " OR " + ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value + " OR " +
ProviderTableMeta.UPLOADS_LAST_RESULT + "==" + UploadResult.DELAYED_FOR_WIFI.getValue() + " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT + "==" + UploadResult.DELAYED_FOR_WIFI.getValue() + " OR " +
ProviderTableMeta.UPLOADS_LAST_RESULT + "==" + UploadResult.DELAYED_FOR_CHARGING.getValue(), ProviderTableMeta.UPLOADS_LAST_RESULT + "==" + UploadResult.DELAYED_FOR_CHARGING.getValue(),
@ -403,20 +402,16 @@ public class UploadsStorageManager extends Observable {
private List<OCUpload> getPendingJobs() { private List<OCUpload> getPendingJobs() {
Set<JobRequest> jobRequests = JobManager.create(mContext).getAllJobRequests(); Set<JobRequest> jobRequests = JobManager.create(mContext).getAllJobRequests();
Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
ArrayList<OCUpload> list = new ArrayList<>(); ArrayList<OCUpload> list = new ArrayList<>();
for (JobRequest ji : jobRequests) { for (JobRequest ji : jobRequests) {
PersistableBundleCompat extras = ji.getExtras(); PersistableBundleCompat extras = ji.getExtras();
if (extras.get("account").equals(currentAccount.name)) {
OCUpload upload = new OCUpload(extras.getString("filePath", ""), OCUpload upload = new OCUpload(extras.getString("filePath", ""),
extras.getString("remotePath", ""), extras.getString("remotePath", ""),
extras.getString("account", "")); extras.getString("account", ""));
list.add(upload); list.add(upload);
} }
}
return list; return list;
} }
@ -443,7 +438,6 @@ public class UploadsStorageManager extends Observable {
Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext); Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
return getUploads( return getUploads(
ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " +
ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value, null); ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value, null);
} }
@ -453,8 +447,7 @@ public class UploadsStorageManager extends Observable {
public OCUpload[] getFinishedUploads() { public OCUpload[] getFinishedUploads() {
Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext); Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
return getUploads(ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " + return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_SUCCEEDED.value, null);
ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_SUCCEEDED.value, null);
} }
/** /**
@ -464,9 +457,7 @@ public class UploadsStorageManager extends Observable {
public OCUpload[] getFailedButNotDelayedUploads() { public OCUpload[] getFailedButNotDelayedUploads() {
Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext); Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
return getUploads( return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value + AND +
ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " +
ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value + AND +
ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_WIFI.getValue() + AND + ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_WIFI.getValue() + AND +
ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_CHARGING.getValue(), ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_CHARGING.getValue(),
null null
@ -481,7 +472,6 @@ public class UploadsStorageManager extends Observable {
Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext); Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
long result = getDB().delete( long result = getDB().delete(
ProviderTableMeta.CONTENT_URI_UPLOADS, ProviderTableMeta.CONTENT_URI_UPLOADS,
ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " +
ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value + AND + ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_FAILED.value + AND +
ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_WIFI.getValue() + AND + ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_WIFI.getValue() + AND +
ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_CHARGING.getValue(), ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_CHARGING.getValue(),
@ -499,7 +489,6 @@ public class UploadsStorageManager extends Observable {
long result = getDB().delete( long result = getDB().delete(
ProviderTableMeta.CONTENT_URI_UPLOADS, ProviderTableMeta.CONTENT_URI_UPLOADS,
ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " +
ProviderTableMeta.UPLOADS_STATUS + "=="+ UploadStatus.UPLOAD_SUCCEEDED.value, null ProviderTableMeta.UPLOADS_STATUS + "=="+ UploadStatus.UPLOAD_SUCCEEDED.value, null
); );
Log_OC.d(TAG, "delete all successful uploads"); Log_OC.d(TAG, "delete all successful uploads");
@ -517,7 +506,6 @@ public class UploadsStorageManager extends Observable {
whereArgs[1] = String.valueOf(UploadStatus.UPLOAD_FAILED.value); whereArgs[1] = String.valueOf(UploadStatus.UPLOAD_FAILED.value);
long result = getDB().delete( long result = getDB().delete(
ProviderTableMeta.CONTENT_URI_UPLOADS, ProviderTableMeta.CONTENT_URI_UPLOADS,
ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "==\"" + currentAccount.name + "\" AND " +
ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=? AND " + ProviderTableMeta.UPLOADS_STATUS + "=? OR " + ProviderTableMeta.UPLOADS_STATUS + "=? AND " +
ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_WIFI.getValue() + AND + ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_WIFI.getValue() + AND +
ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_CHARGING.getValue(), ProviderTableMeta.UPLOADS_LAST_RESULT + "<>" + UploadResult.DELAYED_FOR_CHARGING.getValue(),