Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20469cc6 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Replace SyncRequest syncedFileStateId by SyncedFileState and remove UploadRequest

- Remove UploadRequest.java because I found How to get 'checkEtag' from SyncedFileState
- Replace SyncedFileStateId's field by SyncedFileState instance in SyncRequest.java
- Update DownloadRequest's constructor to fit with SyncRequest's changes.
parent f46be3ca
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ import com.owncloud.android.lib.resources.files.model.RemoteFile;
public class DownloadRequest extends SyncRequest{
    private RemoteFile remoteFile;

    public DownloadRequest (RemoteFile remoteFile, int syncedFileStateId){
        super(syncedFileStateId, Type.DOWNLOAD);
    public DownloadRequest (RemoteFile remoteFile, SyncedFileState syncedFileState){
        super(syncedFileState, Type.DOWNLOAD);
        this.remoteFile = remoteFile;
    }

+6 −6
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ import androidx.annotation.Nullable;
public class SyncRequest {
    public enum Type { UPLOAD, DOWNLOAD, REMOTE_DELETE};

    final private int syncedFileStateId;
    final private SyncedFileState syncedFileState;
    final private Type operationType;

    public SyncRequest(int syncedFileStateId, Type operationType){
        this.syncedFileStateId = syncedFileStateId;
    public SyncRequest(SyncedFileState syncedFileState, Type operationType){
        this.syncedFileState = syncedFileState;
        this.operationType = operationType;
    }

@@ -17,14 +17,14 @@ public class SyncRequest {
        return operationType;
    }

    public int getSyncedFileStateId(){
        return syncedFileStateId;
    public SyncedFileState getSyncedFileState(){
        return syncedFileState;
    }

    @Override
    public boolean equals(@Nullable Object obj) {
        if(obj instanceof SyncRequest){
            return (syncedFileStateId == ((SyncRequest) obj).syncedFileStateId );
            return (syncedFileState.getId() == ((SyncRequest) obj).syncedFileState.getId() );
        }
        return super.equals(obj);
    }
+0 −14
Original line number Diff line number Diff line
package foundation.e.drive.models;

public class UploadRequest extends SyncRequest{
    private boolean checkEtag;

    public UploadRequest(boolean checkEtag, int syncedFileStateId){
        super(syncedFileStateId, Type.UPLOAD);
        this.checkEtag = checkEtag;
    }

    public boolean mustCheckEtag() {
        return checkEtag;
    }
}