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

Fix #5755

Browse source 
- use correct name collision info by synced folder
- syncedFolder.getNameCollisionPolicyInt -> returns int
- syncedFolder.getNameColllisionPolicy -> returns enum
- remove not needed backgroundJobManager from FilesSyncWork.kt

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2020-08-21 09:21:32 +02:00
parent bf460b7451
commit 23b05f3a56
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
7 changed files with 49 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
View file

@ -142,8 +142,7 @@ class BackgroundJobFactory @Inject constructor(
uploadsStorageManager = uploadsStorageManager,
connectivityService = connectivityService,
powerManagementService = powerManagementService,
clock = clock,
backgroundJobManager = backgroundJobManager.get()
clock = clock
)
}

5
src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
View file

@ -70,8 +70,7 @@ class FilesSyncWork(
private val uploadsStorageManager: UploadsStorageManager,
private val connectivityService: ConnectivityService,
private val powerManagementService: PowerManagementService,
private val clock: Clock,
private val backgroundJobManager: BackgroundJobManager
private val clock: Clock
) : Worker(context, params) {
companion object {
@ -197,7 +196,7 @@ class FilesSyncWork(
UploadFileOperation.CREATED_AS_INSTANT_PICTURE,
needsWifi,
needsCharging,
FileUploader.NameCollisionPolicy.ASK_USER
syncedFolder.nameCollisionPolicy
)
filesystemDataProvider.updateFilesystemFileAsSentForUpload(
path,

8
src/main/java/com/owncloud/android/datamodel/SyncedFolder.java
View file

@ -21,6 +21,8 @@
package com.owncloud.android.datamodel;
import com.owncloud.android.files.services.FileUploader;
import java.io.Serializable;
/**
@ -178,10 +180,14 @@ public class SyncedFolder implements Serializable, Cloneable {
return this.uploadAction;
}
public int getNameCollisionPolicy() {
public int getNameCollisionPolicyInt() {
return this.nameCollisionPolicy;
}
public FileUploader.NameCollisionPolicy getNameCollisionPolicy() {
return FileUploader.NameCollisionPolicy.deserialize(nameCollisionPolicy);
}
public boolean isEnabled() {
return this.enabled;
}

2
src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java
View file

@ -399,7 +399,7 @@ public class SyncedFolderProvider extends Observable {
cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ACCOUNT, syncedFolder.getAccount());
cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_UPLOAD_ACTION, syncedFolder.getUploadAction());
cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_NAME_COLLISION_POLICY,
syncedFolder.getNameCollisionPolicy());
syncedFolder.getNameCollisionPolicyInt());
cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_TYPE, syncedFolder.getType().getId());
cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_HIDDEN, syncedFolder.isHidden());

4
src/main/java/com/owncloud/android/operations/UploadFileOperation.java
View file

@ -903,7 +903,9 @@ public class UploadFileOperation extends SyncOperation {
}
@CheckResult
private RemoteOperationResult checkNameCollision(OwnCloudClient client, DecryptedFolderMetadata metadata, boolean encrypted)
private RemoteOperationResult checkNameCollision(OwnCloudClient client,
DecryptedFolderMetadata metadata,
boolean encrypted)
throws OperationCancelledException {
Log_OC.d(TAG, "Checking name collision in server");

68
src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java
View file

@ -403,23 +403,23 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
List<String> filePaths = getDisplayFilePathList(files);
return new SyncedFolderDisplayItem(
syncedFolder.getId(),
syncedFolder.getLocalPath(),
syncedFolder.getRemotePath(),
syncedFolder.isWifiOnly(),
syncedFolder.isChargingOnly(),
syncedFolder.isExisting(),
syncedFolder.isSubfolderByDate(),
syncedFolder.getAccount(),
syncedFolder.getUploadAction(),
syncedFolder.getNameCollisionPolicy(),
syncedFolder.isEnabled(),
clock.getCurrentTime(),
filePaths,
localFolder.getName(),
files.length,
syncedFolder.getType(),
syncedFolder.isHidden());
syncedFolder.getId(),
syncedFolder.getLocalPath(),
syncedFolder.getRemotePath(),
syncedFolder.isWifiOnly(),
syncedFolder.isChargingOnly(),
syncedFolder.isExisting(),
syncedFolder.isSubfolderByDate(),
syncedFolder.getAccount(),
syncedFolder.getUploadAction(),
syncedFolder.getNameCollisionPolicyInt(),
syncedFolder.isEnabled(),
clock.getCurrentTime(),
filePaths,
localFolder.getName(),
files.length,
syncedFolder.getType(),
syncedFolder.isHidden());
}
/**
@ -432,23 +432,23 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
@NonNull
private SyncedFolderDisplayItem createSyncedFolder(@NonNull SyncedFolder syncedFolder, @NonNull MediaFolder mediaFolder) {
return new SyncedFolderDisplayItem(
syncedFolder.getId(),
syncedFolder.getLocalPath(),
syncedFolder.getRemotePath(),
syncedFolder.isWifiOnly(),
syncedFolder.isChargingOnly(),
syncedFolder.isExisting(),
syncedFolder.isSubfolderByDate(),
syncedFolder.getAccount(),
syncedFolder.getUploadAction(),
syncedFolder.getNameCollisionPolicy(),
syncedFolder.isEnabled(),
clock.getCurrentTime(),
mediaFolder.filePaths,
mediaFolder.folderName,
mediaFolder.numberOfFiles,
mediaFolder.type,
syncedFolder.isHidden());
syncedFolder.getId(),
syncedFolder.getLocalPath(),
syncedFolder.getRemotePath(),
syncedFolder.isWifiOnly(),
syncedFolder.isChargingOnly(),
syncedFolder.isExisting(),
syncedFolder.isSubfolderByDate(),
syncedFolder.getAccount(),
syncedFolder.getUploadAction(),
syncedFolder.getNameCollisionPolicyInt(),
syncedFolder.isEnabled(),
clock.getCurrentTime(),
mediaFolder.filePaths,
mediaFolder.folderName,
mediaFolder.numberOfFiles,
mediaFolder.type,
syncedFolder.isHidden());
}
/**

2
src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
View file

@ -61,7 +61,7 @@ public class SyncedFolderParcelable implements Parcelable {
account = syncedFolderDisplayItem.getAccount();
uploadAction = syncedFolderDisplayItem.getUploadAction();
nameCollisionPolicy = FileUploader.NameCollisionPolicy.deserialize(
syncedFolderDisplayItem.getNameCollisionPolicy());
syncedFolderDisplayItem.getNameCollisionPolicyInt());
this.section = section;
hidden = syncedFolderDisplayItem.isHidden();
}