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

Commit dab7414f authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Extract code about fileDiff beetween RemoteFile & Database or local file 

 into a dedicated class.

Clean ObserverService.handleRemoteFile part about fileDiff checking
parent f7f0fe76

app/src/main/java/foundation/e/drive/services/ObserverService.java

+9 −7
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 


package foundation.e.drive.services;



import static com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR;

import static foundation.e.drive.utils.AppConstants.INITIALIZATION_HAS_BEEN_DONE;

import static foundation.e.drive.utils.FileDiffUtils.getActionForFileDiff;



import android.accounts.Account;

import android.accounts.AccountManager;

import android.app.Service;
@@ -20,12 +24,16 @@ import android.os.Handler; 
import android.os.IBinder;

import android.provider.MediaStore;

import android.util.Log;



import androidx.annotation.Nullable;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;

import com.owncloud.android.lib.resources.files.FileUtils;

import com.owncloud.android.lib.resources.files.model.RemoteFile;



import java.io.File;

import java.io.FileFilter;

import java.io.FileOutputStream;
@@ -40,8 +48,8 @@ import foundation.e.drive.fileFilters.FileFilterFactory; 
import foundation.e.drive.fileFilters.OnlyFileFilter;

import foundation.e.drive.models.DownloadRequest;

import foundation.e.drive.models.SyncRequest;

import foundation.e.drive.models.SyncedFolder;

import foundation.e.drive.models.SyncedFileState;

import foundation.e.drive.models.SyncedFolder;

import foundation.e.drive.operations.ListFileRemoteOperation;

import foundation.e.drive.receivers.DebugCmdReceiver;

import foundation.e.drive.utils.AppConstants;
@@ -52,12 +60,6 @@ import foundation.e.drive.utils.FileDiffUtils.Action; 
import foundation.e.drive.utils.ServiceExceptionHandler;

import foundation.e.drive.utils.SynchronizationServiceConnection;



import static com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR;

import static foundation.e.drive.utils.AppConstants.INITIALIZATION_HAS_BEEN_DONE;

import static foundation.e.drive.utils.FileDiffUtils.getActionForFileDiff;



import androidx.annotation.Nullable;



/**

 * @author Vincent Bourgmayer

 * @author Nicolas Gelot

app/src/main/java/foundation/e/drive/utils/FileDiffUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class FileDiffUtils { 
     * @return true if localLastModified store in Database == 0

     */

    private static boolean hasAlreadyBeenDownloaded(SyncedFileState fileState) {

        return fileState.getLocalLastModified() == 0l;

        return fileState.getLocalLastModified() == 0L;

    }



    /**