diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 34e74166112d7eca22fde53420986cd1f42474bb..0000000000000000000000000000000000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "nextcloud-android-lib"] - path = nextcloud-android-lib - url = ../nextcloud-android-lib.git \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 0bda024227adbb6b814b990cd47dad42e43e78be..35eb1ddfbbc029bcab630581847471d7f238ec53 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6f4aaa57a77417379a15172c3dd7c7c8d8c38d32..30c8f6ee9b2b448f62aeaa32314969aee20fbd2c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,9 +63,9 @@ android { } - dependencies { - api project(':NextcloudLib') + implementation 'com.github.nextcloud:android-library:2.10.1' + implementation "commons-httpclient:commons-httpclient:3.1@jar" implementation fileTree(include: ['*.jar'], dir: 'libs') api 'androidx.annotation:annotation:1.3.0' implementation 'androidx.core:core:1.6.0' diff --git a/app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java b/app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java index 4445239c721e7a0ead86a1264ed77327d9b88cde..0142dcdf869f41cfbbac424a14b85f81d8a7c3af 100644 --- a/app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java +++ b/app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java @@ -13,6 +13,7 @@ import android.util.Log; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.DownloadFileRemoteOperation; import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.lib.resources.files.model.RemoteFile; import java.io.File; @@ -28,11 +29,11 @@ public class DownloadFileOperation extends RemoteOperation { private final static String TAG = DownloadFileOperation.class.getSimpleName(); private final RemoteFile remoteFile; - private Context context; - private String targetPath; + private final Context context; + private final String targetPath; private int restartCounter =0; - private SyncedFileState syncedFileState; - private String previousEtag; + private final SyncedFileState syncedFileState; + private final String previousEtag; /** * COnstructor of download operation where syncedFileState is already known @@ -50,26 +51,22 @@ public class DownloadFileOperation extends RemoteOperation { @Override protected RemoteOperationResult run(OwnCloudClient ownCloudClient) { Log.i(TAG, "run(ownCloudClient)"); - - //get or build synced file equivalent of this.mFile - if (syncedFileState == null || targetPath == null || targetPath.isEmpty()) { - Log.e(TAG, "syncedFileState or targetPath is empty or null. Can't Download in those conditions"); - return new RemoteOperationResult(RemoteOperationResult.ResultCode.FORBIDDEN); - } else if (syncedFileState.getId() == -1) { + if (syncedFileState.getId() == -1) { this.syncedFileState.setId(DbHelper.manageSyncedFileStateDB(this.syncedFileState, "INSERT", context)); } - if (syncedFileState.getLastETAG().equals(remoteFile.getEtag()) && syncedFileState.getLocalLastModified() > 0L) { - //Same etag and localLastModified not null mean the file is up to date + if (syncedFileState.getLastETAG().equals(remoteFile.getEtag()) + && syncedFileState.getLocalLastModified() > 0L) { //file is up to date Log.w(TAG, "File already up-to-date"); return new RemoteOperationResult(RemoteOperationResult.ResultCode.ETAG_UNCHANGED); } final String tmpTargetPath = context.getExternalCacheDir()+ FileUtils.PATH_SEPARATOR+ syncedFileState.getName(); + final DownloadFileRemoteOperation downloadOperation = new DownloadFileRemoteOperation(remoteFile.getRemotePath(), tmpTargetPath); - final RemoteOperationResult downloadResult = downloadOperation.execute(ownCloudClient); + RemoteOperationResult.ResultCode resultCode; boolean mustRestart = true; @@ -78,32 +75,20 @@ public class DownloadFileOperation extends RemoteOperation { if (!tmpLocalFile.exists()) { Log.e(TAG, "Downloaded file doesn't exist or is null"); resultCode = RemoteOperationResult.ResultCode.FILE_NOT_FOUND; - } else if (tmpLocalFile.length() != remoteFile.getLength()) { - Log.e(TAG, "Local and remote file doesn't have the same size."); resultCode = RemoteOperationResult.ResultCode.INVALID_OVERWRITE; tmpLocalFile.delete(); + } else { //file has been correctly download - } else { - //file has been correctly download. final File localFile = new File(targetPath); - if (localFile.exists()) { - localFile.delete(); - } - //Check parentFolder existence and create if needed - final String parentFoldersPath = localFile.getParent(); - final File localParentFile = new File(parentFoldersPath); - if (!localParentFile.exists()) { - if (localParentFile.mkdirs()) - Log.d(TAG, "Created folders: "+parentFoldersPath); - else - Log.d(TAG, "Can't create folders: "+parentFoldersPath); + if (localFile.exists()) { localFile.delete(); } + + if (!tmpLocalFile.renameTo(localFile)) { + Log.d(TAG, "Can't move " + tmpTargetPath + " to " + targetPath); + return new RemoteOperationResult(RemoteOperationResult.ResultCode.FORBIDDEN); } - boolean renameResult = tmpLocalFile.renameTo(localFile); - if (!renameResult) - Log.d(TAG, "File hasn't been successfully moved at its place"); syncedFileState.setLocalLastModified(localFile.lastModified()) .setLastETAG(remoteFile.getEtag()); mustRestart = false; @@ -118,7 +103,7 @@ public class DownloadFileOperation extends RemoteOperation { } if (mustRestart) { - Log.w(TAG, restartCounter+" unsuccessfull trial.s of downloading file " + Log.w(TAG, restartCounter+" unsuccessfull trial.s of downloading " + remoteFile.getRemotePath()); syncedFileState.setLastETAG(this.previousEtag); if (this.restartCounter < 3) { diff --git a/app/src/main/java/foundation/e/drive/operations/DownloadFileRemoteOperation.java b/app/src/main/java/foundation/e/drive/operations/DownloadFileRemoteOperation.java deleted file mode 100644 index dce9dff620ad4ab620450b046dcd50eb94fb49e5..0000000000000000000000000000000000000000 --- a/app/src/main/java/foundation/e/drive/operations/DownloadFileRemoteOperation.java +++ /dev/null @@ -1,180 +0,0 @@ - -/* ownCloud Android Library is available under MIT license - * Copyright (C) 2015 ownCloud Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - */ -package foundation.e.drive.operations; - -import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.network.WebdavUtils; -import com.owncloud.android.lib.common.operations.OperationCancelledException; -import com.owncloud.android.lib.common.operations.RemoteOperation; -import com.owncloud.android.lib.common.operations.RemoteOperationResult; -import com.owncloud.android.lib.common.utils.Log_OC; -import org.apache.commons.httpclient.Header; -import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.GetMethod; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Date; -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * Remote operation performing the download of a remote file in the ownCloud server. - * - * @author David A. Velasco - * @author masensio - * @author Vincent Bourgmayer - */ -class DownloadFileRemoteOperation extends RemoteOperation { - private static final String TAG = DownloadFileRemoteOperation.class.getSimpleName(); - - private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false); - private long mModificationTimestamp = 0; - private String mEtag = ""; - private GetMethod mGet; - private final String mRemotePath; - private final String mLocalFolderPath; - - /** - * Constructor - * @param remotePath Path of file on the server - * @param localFolderPath Path of file on the device - */ - public DownloadFileRemoteOperation(String remotePath, String localFolderPath) { - mRemotePath = remotePath; - mLocalFolderPath = localFolderPath; - } - - @Override - protected RemoteOperationResult run(OwnCloudClient client) { - RemoteOperationResult result = null; - /// download will be performed to a temporal file, then moved to the final location - File tmpFile = new File(getTmpPath()); - /// perform the download - try { - tmpFile.getParentFile().mkdirs(); - int status = downloadFile(client, tmpFile); - result = new RemoteOperationResult(isSuccess(status), mGet); - Log_OC.i(TAG, "Download of " + mRemotePath + " to " + getTmpPath() + ": " + - result.getLogMessage()); - - } catch (Exception e) { - result = new RemoteOperationResult(e); - Log_OC.e(TAG, "Download of " + mRemotePath + " to " + getTmpPath() + ": " + - result.getLogMessage(), e); - } - - return result; - } - - private int downloadFile(OwnCloudClient client, File targetFile) throws IOException, OperationCancelledException { - int status = -1; - boolean savedFile = false; - mGet = new GetMethod(client.getWebdavUri() + WebdavUtils.encodePath(mRemotePath)); - - FileOutputStream fos = null; - try { - status = client.executeMethod(mGet); - if (isSuccess(status)) { - targetFile.createNewFile(); - BufferedInputStream bis = new BufferedInputStream(mGet.getResponseBodyAsStream()); - fos = new FileOutputStream(targetFile); - long transferred = 0; - - Header contentLength = mGet.getResponseHeader("Content-Length"); - long totalToTransfer = (contentLength != null && - contentLength.getValue().length() > 0) ? - Long.parseLong(contentLength.getValue()) : 0; - - byte[] bytes = new byte[4096]; - int readResult = 0; - while ((readResult = bis.read(bytes)) != -1) { - synchronized (mCancellationRequested) { - if (mCancellationRequested.get()) { - mGet.abort(); - throw new OperationCancelledException(); - } - } - fos.write(bytes, 0, readResult); - transferred += readResult; - } - // Check if the file is completed - // if transfer-encoding: chunked we cannot check if the file is complete - Header transferEncodingHeader = mGet.getResponseHeader("Transfer-Encoding"); - boolean transferEncoding = false; - - if (transferEncodingHeader != null) { - transferEncoding = transferEncodingHeader.getValue().equals("chunked"); - } - - if (transferred == totalToTransfer || transferEncoding) { - savedFile = true; - Header modificationTime = mGet.getResponseHeader("Last-Modified"); - if (modificationTime == null) { - modificationTime = mGet.getResponseHeader("last-modified"); - } - if (modificationTime != null) { - Date d = WebdavUtils.parseResponseDate(modificationTime.getValue()); - mModificationTimestamp = (d != null) ? d.getTime() : 0; - } else { - Log_OC.e(TAG, "Could not read modification time from response downloading " + mRemotePath); - } - - mEtag = WebdavUtils.getEtagFromResponse(mGet); - if (mEtag.length() == 0) { - Log_OC.e(TAG, "Could not read eTag from response downloading " + mRemotePath); - } - - } else { - client.exhaustResponse(mGet.getResponseBodyAsStream()); - // TODO some kind of error control! - } - } else { - client.exhaustResponse(mGet.getResponseBodyAsStream()); - } - } catch (Exception e) { - Log_OC.e(TAG, e.getMessage()); - } finally { - if (fos != null) fos.close(); - if (!savedFile && targetFile.exists()) { - targetFile.delete(); - } - mGet.releaseConnection(); // let the connection available for other methods - } - return status; - } - - private boolean isSuccess(int status) { - return (status == HttpStatus.SC_OK); - } - - /** - * IMPLEMENTATION DIFFER FROM NC IMPLEMENTATION - * @return - */ - private String getTmpPath() { - return mLocalFolderPath; - } -} diff --git a/app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java b/app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java index 4f67f76f95ff326c7810406b8ff375c97ecd5711..7df0b64fae9ab2a7da8ede86a0d9fd2fe6cceacb 100644 --- a/app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java +++ b/app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java @@ -24,7 +24,6 @@ import java.util.ArrayList; /** * @author TheScarastic */ - public class GetAliasOperation extends RemoteOperation { private static final String TAG = GetAliasOperation.class.getSimpleName(); @@ -35,14 +34,13 @@ public class GetAliasOperation extends RemoteOperation { private static final String NODE_DATA = "data"; private static final String NODE_ALIASES = "aliases"; - private boolean isSuccess(int status) { return (status == HttpStatus.SC_OK); } @Override - protected RemoteOperationResult run(OwnCloudClient client) { - RemoteOperationResult result; + protected RemoteOperationResult> run(OwnCloudClient client) { + RemoteOperationResult> result; GetMethod get = null; final String uri = client.getBaseUri() + ALIAS_PATH + client.getCredentials().getUsername(); @@ -52,25 +50,25 @@ public class GetAliasOperation extends RemoteOperation { get.setQueryString(new NameValuePair[]{new NameValuePair("format", "json")}); if (isSuccess(client.executeMethod(get))) { - String response = get.getResponseBodyAsString(); + final String response = get.getResponseBodyAsString(); // parse final JSONArray aliases = new JSONObject(response).getJSONObject(NODE_OCS) .getJSONObject(NODE_DATA).getJSONArray(NODE_ALIASES); - final ArrayList resultAliases = new ArrayList<>(); + final ArrayList resultAliases = new ArrayList<>(); for (int i = 0; i < aliases.length(); i++) { - resultAliases.add(aliases.get(i)); + resultAliases.add(aliases.get(i).toString()); } - result = new RemoteOperationResult(true, get); - result.setData(resultAliases); + result = new RemoteOperationResult<>(true, get); + result.setResultData(resultAliases); } else { - result = new RemoteOperationResult(false, get); + result = new RemoteOperationResult<>(false, get); } } catch (Exception e) { e.printStackTrace(); - result = new RemoteOperationResult(e); + result = new RemoteOperationResult<>(e); Log_OC.e(TAG, "Fetching aliases failed"); } finally { if (get != null) diff --git a/app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java b/app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java index ffde62e895fbb87477aaed727c39cc5784a376cf..fea2f6c7ab71cf060afedc3aa794e43da4962766 100644 --- a/app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java +++ b/app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java @@ -13,8 +13,8 @@ import android.util.Log; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation; import com.owncloud.android.lib.resources.files.model.RemoteFile; -import com.owncloud.android.lib.resources.files.LightReadFolderRemoteOperation; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -23,12 +23,10 @@ import foundation.e.drive.database.DbHelper; import foundation.e.drive.models.SyncedFolder; import foundation.e.drive.utils.CommonUtils; -import static org.apache.jackrabbit.webdav.DavConstants.DEPTH_1; - /** * * @author Vincent Bourgmayer - * Created by Vincent on 04/05/2018. + * Created on 04/05/2018. */ public class ListFileRemoteOperation extends RemoteOperation { private final String TAG = ListFileRemoteOperation.class.getSimpleName(); @@ -37,8 +35,7 @@ public class ListFileRemoteOperation extends RemoteOperation { private final Context mContext; private final int initialFolderNumber; - public ListFileRemoteOperation(List syncedFolders, Context context, int initialFolderNumber){ - Log.i(TAG, "Constructor of ListFileRemoteOperation"); + public ListFileRemoteOperation(List syncedFolders, Context context, int initialFolderNumber) { this.mSyncedFolders = syncedFolders; this.mContext = context; this.initialFolderNumber = initialFolderNumber; @@ -50,124 +47,98 @@ public class ListFileRemoteOperation extends RemoteOperation { * @return List containing remoteFolder followed by remote files */ @Override - protected RemoteOperationResult run(OwnCloudClient ownCloudClient){ + protected RemoteOperationResult run(OwnCloudClient ownCloudClient) { Log.i(TAG, "run()"); - ArrayList mRemoteFiles = new ArrayList<>(); + final ArrayList mRemoteFiles = new ArrayList<>(); RemoteOperationResult finalResult; boolean atLeastOneDirAsChanged = false; - ListIterator mSyncedFolderIterator = mSyncedFolders.listIterator(); - - //Loop through list of SyncedFolder - while (mSyncedFolderIterator.hasNext() ){ + final ListIterator mSyncedFolderIterator = mSyncedFolders.listIterator(); - //Get CurrentSyncedFolder - SyncedFolder syncedFolder = mSyncedFolderIterator.next(); + while (mSyncedFolderIterator.hasNext()) { - //if folder is media type() && is an hidden folder then ignore it - if(syncedFolder.isMediaType() - && CommonUtils.getFileNameFromPath(syncedFolder.getRemoteFolder()).startsWith(".")){ - mSyncedFolderIterator.remove(); - continue; + try{ + Thread.sleep(150); + }catch(InterruptedException e) { + Log.w(TAG, "listFileRemoteOperation's sleep had been interrupted"); } - //If folder isn't to be scan remotly, ignore it - if(!syncedFolder.isScanRemote()) { + final SyncedFolder syncedFolder = mSyncedFolderIterator.next(); + if (shouldSkipSyncedFolder(syncedFolder)) { mSyncedFolderIterator.remove(); continue; } - if(syncedFolder.getId() == -1) { - //persist new syncedFolder + if (syncedFolder.getId() == -1) { int syncedFolderId = (int) DbHelper.insertSyncedFolder(syncedFolder, mContext); if (syncedFolderId > 0) { syncedFolder.setId(syncedFolderId); - }else{ + } else { mSyncedFolderIterator.remove(); - Log.w(TAG, "syncedFolder "+syncedFolder.getRemoteFolder()+" doesn't have a valid ID"); + Log.w(TAG, "ignore syncedFolder :" +syncedFolder.getRemoteFolder()+ " can't be saved in DB"); continue; } } //Create ReadRemoteOperation - LightReadFolderRemoteOperation operation = new LightReadFolderRemoteOperation(syncedFolder.getRemoteFolder(), DEPTH_1, false); - RemoteOperationResult result = operation.execute(ownCloudClient); - - if(result.isSuccess() ){ - //is success then data can't be null - int dataSize = result.getData().size(); - if(dataSize > 1){ //There is at least one subfiles - RemoteFile directory = (RemoteFile) result.getData().get(0); - if(!directory.getEtag().equals(syncedFolder.getLastEtag() )){ //if etag differs - List remoteFiles = result.getData().subList( 1, dataSize ); //get list of subfiles - - //loop through subelements - for (int i = -1, remoteFilesSize = remoteFiles.size(); ++i < remoteFilesSize; ){ - RemoteFile remoteFile = (RemoteFile) remoteFiles.get(i); - - //if remoteFile is in a "media" folder and its name start with "." - // then ignore it - if(syncedFolder.isMediaType() - && CommonUtils.getFileNameFromPath( remoteFile.getRemotePath() ).startsWith(".") ){ - continue; - } - if( remoteFile.getMimeType().equals("DIR") ) { - String suffixPath = remoteFile.getRemotePath().substring( syncedFolder.getRemoteFolder().length() ); - - //but is it already known as SyncedFolder? - SyncedFolder subSyncedFolder = new SyncedFolder(syncedFolder, suffixPath, 0L, "" ); //need to set empty etag to allow it to be scan - mSyncedFolderIterator.add(subSyncedFolder); - mSyncedFolderIterator.previous(); - - }else { - //If it's a file just add it to mRemoteFiles. - mRemoteFiles.add(remoteFile); - } + final ReadFolderRemoteOperation operation = new ReadFolderRemoteOperation(syncedFolder.getRemoteFolder()); + final RemoteOperationResult result = operation.execute(ownCloudClient); + + if (result.isSuccess()) { + final int dataSize = result.getData().size(); + final RemoteFile directory = (RemoteFile) result.getData().get(0); + if (directory.getEtag().equals(syncedFolder.getLastEtag())) { + continue; + } else { + syncedFolder.setLastEtag(directory.getEtag()).setToSync(true); + atLeastOneDirAsChanged = true; + } + + if (dataSize > 1) { + final List remoteFiles = result.getData().subList(1, dataSize); //get list of subfiles + + for (int i = -1, remoteFilesSize = remoteFiles.size(); ++i < remoteFilesSize;) { + final RemoteFile remoteFile = (RemoteFile) remoteFiles.get(i); + + if (remoteFile.getMimeType().equals("DIR")) { + final String suffixPath = remoteFile.getRemotePath().substring(syncedFolder.getRemoteFolder().length()); + + final SyncedFolder subSyncedFolder = new SyncedFolder(syncedFolder, suffixPath, 0L, ""); //need to set empty etag to allow it to be scan + mSyncedFolderIterator.add(subSyncedFolder); + mSyncedFolderIterator.previous(); + + } else { + mRemoteFiles.add(remoteFile); } - syncedFolder.setLastEtag(directory.getEtag() ).setToSync(true); - atLeastOneDirAsChanged = true; - } - }else if(dataSize == 1){ //Empty folder - RemoteFile directory = (RemoteFile) result.getData().get(0); - if(!directory.getEtag().equals(syncedFolder.getLastEtag())) { - syncedFolder.setLastEtag(directory.getEtag()).setToSync(true); - atLeastOneDirAsChanged = true; } - }//Last else correspond to error 404 at LightReadFolderRemoteOperation (see below) - }else{ //Result isn't a success - if(result.getHttpCode() == 404){ //File not found + } + } else { //Result isn't a success + if (result.getHttpCode() == 404) { //File not found atLeastOneDirAsChanged = true; syncedFolder.setToSync(true); //If there is no remote file, then try to delete local one if empty. Finally remove Synced Folder from DB. - File localFolder = new File(syncedFolder.getLocalFolder()); - if(localFolder.exists() && localFolder.listFiles().length == 0){ - localFolder.delete(); - } - if( !localFolder.exists() ) { + final File localFolder = new File(syncedFolder.getLocalFolder()); + + if (!localFolder.exists()) { if (syncedFolder.getId() > this.initialFolderNumber/*-1*/) { //does the synced folder has been persisted? - //remove it from DB - int deleteResult = DbHelper.deleteSyncedFolder(syncedFolder.getId(), mContext); - Log.d(TAG, "syncedFolder Id: "+syncedFolder.getId() + " deletion from db return " + deleteResult + " row affected"); + //remove it from DB. @Todo: do not remove, just disable + final int deleteResult = DbHelper.deleteSyncedFolder(syncedFolder.getId(), mContext); + Log.d(TAG, "syncedFolder Id: " +syncedFolder.getId() + " deletion from db return " + deleteResult + " row affected"); } mSyncedFolderIterator.remove(); + } else if (localFolder.listFiles().length == 0) { + localFolder.delete(); } } - Log.w(TAG, "LightReadFolderRemoteOperation failed : http " + result.getHttpCode() + ", " + result.getLogMessage()+" => Ignored"); - } - - - try{ - Thread.sleep(150); - }catch(InterruptedException e){ - Log.w(TAG, "listFileRemoteOperation's sleep had been interrupted"); + Log.w(TAG, "LightReadFolderRemoteOperation failed : http " + result.getHttpCode() + ", " + result.getLogMessage()+ " => Ignored"); } } //End of loop finalResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.OK); - if( atLeastOneDirAsChanged ) { + if (atLeastOneDirAsChanged) { DbHelper.updateSyncedFolders(this.mSyncedFolders, this.mContext); - finalResult.setData(new ArrayList(mRemoteFiles) ); + finalResult.setData(new ArrayList(mRemoteFiles)); } Log.v(TAG, "end of run()"); @@ -178,7 +149,13 @@ public class ListFileRemoteOperation extends RemoteOperation { * * @return list of syncedFolder */ - public List getSyncedFolderList(){ + public List getSyncedFolderList() { return this.mSyncedFolders; - } + } + + private boolean shouldSkipSyncedFolder(SyncedFolder syncedFolder) { + return (syncedFolder.isMediaType() + && CommonUtils.getFileNameFromPath(syncedFolder.getRemoteFolder()).startsWith(".")) + || !syncedFolder.isScanRemote(); + } } diff --git a/app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java b/app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java index 5b4c24ae50d72f4e268accd8271cb4b476004b8e..28e359d318c83dbabfcb0c0f393d9fe06667fe14 100644 --- a/app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java +++ b/app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java @@ -10,7 +10,6 @@ package foundation.e.drive.operations; import android.content.Context; import android.util.Log; - import androidx.annotation.VisibleForTesting; import com.owncloud.android.lib.common.OwnCloudClient; @@ -20,10 +19,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation; import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation; -import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation; + import java.io.File; -import java.util.ArrayList; import foundation.e.drive.database.DbHelper; import foundation.e.drive.models.SyncedFileState; import foundation.e.drive.utils.CommonUtils; @@ -38,6 +37,7 @@ public class UploadFileOperation extends RemoteOperation { private int restartCounter =0; private long previousLastModified; //get to restore real value if all trials fails private Context context; + private SyncedFileState syncedState; private long availableQuota = -1; @@ -64,34 +64,27 @@ public class UploadFileOperation extends RemoteOperation { */ @Override protected RemoteOperationResult run(OwnCloudClient client ) { - //as operation isn't executed immediatly, file might have been deleted since creation of operation - if (syncedState == null ) { - Log.e(TAG, "run(client): no syncedFileState or target path, can't perform upload operation"); - return new RemoteOperationResult(ResultCode.FORBIDDEN); - } - - File file = new File(syncedState.getLocalPath()); - if (file == null || !file.exists()) { + // file might have been deleted since creation of operation + final File file = new File(syncedState.getLocalPath()); + if (!file.exists()) { Log.w(TAG, "Can't get the file. It might have been deleted"); return new RemoteOperationResult(ResultCode.FORBIDDEN); } final String targetPath = syncedState.getRemotePath(); - //If an Etag is already Stored and LastModified from DB is the same as real file + //If file already up-to-date & synced if (syncedState.isLastEtagStored() && syncedState.getLocalLastModified() == file.lastModified()) { Log.d(TAG, "syncedState last modified: "+ syncedState.getLocalLastModified()+" <=> file last modified: "+file.lastModified() +": So return sync_conflict"); return new RemoteOperationResult(ResultCode.SYNC_CONFLICT); } - Float relativeQuotaBeforeFileUpload = 0.0f; - if (this.availableQuota == -1) { - RemoteOperationResult checkQuotaResult = checkAvailableSpace(client, file.length()); + if (this.availableQuota == -1) { //if upload is retried because of failure (mustRestart = true) this test avoid rechecking quota + final RemoteOperationResult checkQuotaResult = checkAvailableSpace(client, file.length()); if (checkQuotaResult.getCode() != ResultCode.OK) { + Log.e(TAG, "Impossible to check quota. Upload of " + syncedState.getLocalPath() + "cancelled"); return new RemoteOperationResult(checkQuotaResult.getCode()); - } else { - relativeQuotaBeforeFileUpload = ((Double) checkQuotaResult.getSingleData()).floatValue(); } } @@ -99,18 +92,17 @@ public class UploadFileOperation extends RemoteOperation { return new RemoteOperationResult(ResultCode.UNKNOWN_ERROR); } - final UploadFileRemoteOperation uploadOperation = buildUploadOperation(file, targetPath); + final UploadFileRemoteOperation uploadOperation = buildUploadOperation(file); - // Execute UploadFileOperation - RemoteOperationResult uploadResult = uploadOperation.execute(client ); - ResultCode resultCode; + final RemoteOperationResult uploadResult = uploadOperation.execute(client ); + final ResultCode resultCode; boolean mustRestart = true; //if upload is a success if (uploadResult.isSuccess()) { - Object data = uploadResult.getSingleData(); - if (data != null) { - syncedState.setLastETAG((String) data); + String etag = uploadResult.getResultData(); + if (etag != null) { + syncedState.setLastETAG(etag); } syncedState.setLocalLastModified(file.lastModified()); resultCode = uploadResult.getCode(); @@ -124,7 +116,6 @@ public class UploadFileOperation extends RemoteOperation { resultCode = ResultCode.QUOTA_EXCEEDED; mustRestart = false; } else { - //Upload failed Log.e(TAG, "UploadFileRemoteOperation for : " + file.getName() + " failed => code: " + uploadResult.getCode()); resultCode = ResultCode.UNKNOWN_ERROR; mustRestart = false; @@ -134,37 +125,28 @@ public class UploadFileOperation extends RemoteOperation { if (mustRestart) { if (this.restartCounter < 1) { this.restartCounter += 1; - //if we encounter more than one time same error, stop trying to upload. return this.run(client); } else { syncedState.setLocalLastModified(this.previousLastModified); //Revert syncFileState to its previous state } } - // updated syncedFile in DB DbHelper.manageSyncedFileStateDB(syncedState, "UPDATE", context); - ArrayList datas = new ArrayList<>(); - datas.add(syncedState.getSyncedFolderId()); - datas.add(relativeQuotaBeforeFileUpload); - final RemoteOperationResult finalResult = new RemoteOperationResult(resultCode); - finalResult.setData(datas); - return finalResult; + return new RemoteOperationResult(resultCode); } /** * Build the operation to put the file on server * @return the operation to execute */ - private UploadFileRemoteOperation buildUploadOperation(File file, String targetPath) { - String timeStamp = ((Long) (file.lastModified() / 1000) ).toString() ; + private UploadFileRemoteOperation buildUploadOperation(File file) { + final String timeStamp = ((Long) (file.lastModified() / 1000) ).toString() ; - //create UploadFileOperation - UploadFileRemoteOperation uploadRemoteFileOperation = new UploadFileRemoteOperation(syncedState.getLocalPath(), - (targetPath != null ) ? targetPath : syncedState.getRemotePath(), + final UploadFileRemoteOperation uploadRemoteFileOperation = new UploadFileRemoteOperation(syncedState.getLocalPath(), + syncedState.getRemotePath(), CommonUtils.getMimeType(file ), (!this.syncedState.isMediaType() || syncedState.getLastETAG().isEmpty() )? null : syncedState.getLastETAG(), //If not null, This can cause error 412; that means remote file has change timeStamp ); - uploadRemoteFileOperation.askResultEtag(true); return uploadRemoteFileOperation; } @@ -175,27 +157,20 @@ public class UploadFileOperation extends RemoteOperation { */ @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) public RemoteOperationResult checkAvailableSpace(OwnCloudClient client, long fileSize) { - GetRemoteUserInfoOperation getRemoteUserInfoOperation = new GetRemoteUserInfoOperation(); - RemoteOperationResult ocsResult = getRemoteUserInfoOperation.execute(client); - if (ocsResult.isSuccess() && ocsResult.getData() != null) { - UserInfo userInfo = (UserInfo) ocsResult.getData().get(0); - this.availableQuota = userInfo.getQuota().getFree(); - if (((UserInfo) ocsResult.getData().get(0)).getQuota().getFree() < fileSize ) { - Log.w(TAG, "quota exceeded!"); - return new RemoteOperationResult(ResultCode.QUOTA_EXCEEDED); - } else { - Log.d(TAG, "Quota Okay"); - RemoteOperationResult result = new RemoteOperationResult(ResultCode.OK); - result.setSingleData((Double) userInfo.getQuota().getRelative()); - return result; - } - } else { - Log.w(TAG, "getRemoteUserInfoOperation failed: "+ocsResult.getHttpCode() ); - return new RemoteOperationResult(ocsResult.getCode()); + final GetUserInfoRemoteOperation getRemoteUserInfoOperation = new GetUserInfoRemoteOperation(); + final RemoteOperationResult ocsResult = getRemoteUserInfoOperation.execute(client); + final UserInfo userInfo = ocsResult.getResultData(); + + final RemoteOperationResult result; + if(ocsResult.isSuccess() && userInfo.getQuota().getFree() < fileSize) { + Log.w(TAG, "Not enough quota to upload the file"); + result = new RemoteOperationResult(ResultCode.QUOTA_EXCEEDED); + } else { + result = new RemoteOperationResult(ocsResult.getCode()); } + return result; } - /** * Create remote parent folder of the file if missing * @param targetPath @@ -216,4 +191,8 @@ public class UploadFileOperation extends RemoteOperation { } return false; } + + public SyncedFileState getSyncedState() { + return syncedState; + } } diff --git a/app/src/main/java/foundation/e/drive/services/SynchronizationService.java b/app/src/main/java/foundation/e/drive/services/SynchronizationService.java index 72cee50c44d164f321e499f76523e008e4695769..d77c69c339f3033c019f9a3239749827eea8d0ff 100644 --- a/app/src/main/java/foundation/e/drive/services/SynchronizationService.java +++ b/app/src/main/java/foundation/e/drive/services/SynchronizationService.java @@ -154,11 +154,6 @@ public class SynchronizationService extends Service implements OnRemoteOperation } } else { String operationClassName = callerOperation.getClass().getSimpleName(); - final ArrayList callerOperationResultData = result.getData(); - if (callerOperation instanceof UploadFileOperation && callerOperationResultData != null - && callerOperationResultData.size() > 1) { - final Float relativeQuota = (Float) result.getData().get(1); - } switch (result.getCode()) { case OK: Log.d(TAG, operationClassName + " Succeed"); @@ -172,24 +167,16 @@ public class SynchronizationService extends Service implements OnRemoteOperation break; case UNKNOWN_ERROR: if (callerOperation instanceof UploadFileOperation) { - if (callerOperationResultData != null && callerOperationResultData.size() > 0) { - int rowAffected = DbHelper.forceFoldertoBeRescan(((Long) callerOperationResultData.get(0)).intValue(), getApplicationContext()); - Log.e(TAG, " Upload failed for unknown reason.\n Force folder to be rescan next time (row affected) :" + rowAffected); - } else { - Log.w(TAG, "result.getData() for UploadFileOperation returned null"); - } + final int rowAffected = DbHelper.forceFoldertoBeRescan(((UploadFileOperation) callerOperation).getSyncedState().getId(), getApplicationContext()); + Log.e(TAG, " Upload failed for unknown reason.\n Force folder to be rescan next time (row affected) :" + rowAffected); } else if (callerOperation instanceof DownloadFileOperation) { Log.e(TAG, " Download: Unknown_error : failed"); } break; case FORBIDDEN: if (callerOperation instanceof UploadFileOperation) { - if (callerOperationResultData != null && callerOperationResultData.size() > 0) { - int rowAffected = DbHelper.forceFoldertoBeRescan(((Long) callerOperationResultData.get(0)).intValue(), getApplicationContext()); - Log.e(TAG, " Upload: Forbidden : Can't get syncedFileState, no remote path defined. Force folder to be rescan next time (row affected) :" + rowAffected); - } else { - Log.w(TAG, "result.getData() for UploadFileOperation returned null"); - } + final int rowAffected = DbHelper.forceFoldertoBeRescan(((UploadFileOperation) callerOperation).getSyncedState().getId(), getApplicationContext()); + Log.e(TAG, " Upload: Forbidden : Can't get syncedFileState, no remote path defined. Force folder to be rescan next time (row affected) :" + rowAffected); } else if (callerOperation instanceof DownloadFileOperation) { Log.e(TAG, "Download : Forbidden: Can't get syncedFileState, no local path defined"); } diff --git a/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java b/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java index b253289484acf2402dc7b9d97413f049d760a5f4..c42fb578d188489c4e1a61b55072f79db9300cb1 100644 --- a/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java +++ b/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java @@ -30,9 +30,10 @@ import androidx.work.WorkerParameters; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.Quota; import com.owncloud.android.lib.common.UserInfo; import com.owncloud.android.lib.common.operations.RemoteOperationResult; -import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation; +import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation; import java.util.ArrayList; @@ -49,9 +50,9 @@ import foundation.e.drive.widgets.EDriveWidget; */ public class AccountUserInfoWorker extends Worker { public static final String UNIQUE_WORK_NAME = "AccountUserInfoWorker"; - final AccountManager accountManager; - final GetRemoteUserInfoOperation getRemoteUserInfoOperation = new GetRemoteUserInfoOperation(); - final GetAliasOperation getAliasOperation = new GetAliasOperation(); + private final AccountManager accountManager; + private final GetUserInfoRemoteOperation getRemoteUserInfoOperation = new GetUserInfoRemoteOperation(); + private final GetAliasOperation getAliasOperation = new GetAliasOperation(); private final Context mContext; private Account account; @@ -66,7 +67,7 @@ public class AccountUserInfoWorker extends Worker { public Result doWork() { account = CommonUtils.getAccount(mContext.getString(R.string.eelo_account_type), accountManager); - OwnCloudClient client = CommonUtils.getOwnCloudClient(account, mContext); + final OwnCloudClient client = CommonUtils.getOwnCloudClient(account, mContext); if (account != null && client != null) { if (fetchUserInfo(client) && fetchAliases(client)) { @@ -85,32 +86,26 @@ public class AccountUserInfoWorker extends Worker { } private boolean fetchUserInfo(final OwnCloudClient client) { - final RemoteOperationResult ocsResult = getRemoteUserInfoOperation.execute(client); + final RemoteOperationResult ocsResult = getRemoteUserInfoOperation.execute(client); - if (ocsResult.isSuccess() && ocsResult.getData() != null && !ocsResult.getData().isEmpty()) { - final UserInfo userInfo = (UserInfo) ocsResult.getData().get(0); + if (ocsResult.isSuccess()) { + final UserInfo userInfo = ocsResult.getResultData(); - final String name; - if (userInfo.displayName == null || userInfo.displayName.isEmpty()) { - name = userInfo.alternateDisplayName; - } else { - name = userInfo.displayName; - } - final double relativeQuota = userInfo.getQuota().relative; - long totalQuota = userInfo.getQuota().total; + final Quota userQuota = userInfo.getQuota(); + final double relativeQuota = userQuota.getRelative(); + long totalQuota = userQuota.getTotal(); if (totalQuota <= 0) { totalQuota = 0; } - final long usedQuota = userInfo.getQuota().used; - final String groups = String.join(",", userInfo.groups); - final String email = userInfo.id; - accountManager.setUserData(account, ACCOUNT_DATA_NAME, name); - accountManager.setUserData(account, ACCOUNT_DATA_EMAIL, email); + final String groups = String.join(",", userInfo.getGroups()); + + accountManager.setUserData(account, ACCOUNT_DATA_NAME, userInfo.getDisplayName()); + accountManager.setUserData(account, ACCOUNT_DATA_EMAIL, userInfo.getEmail()); accountManager.setUserData(account, ACCOUNT_DATA_GROUPS, groups); accountManager.setUserData(account, ACCOUNT_DATA_TOTAL_QUOTA_KEY, "" + totalQuota); accountManager.setUserData(account, ACCOUNT_DATA_RELATIVE_QUOTA_KEY, "" + relativeQuota); - accountManager.setUserData(account, ACCOUNT_DATA_USED_QUOTA_KEY, "" + usedQuota); + accountManager.setUserData(account, ACCOUNT_DATA_USED_QUOTA_KEY, "" + userQuota.getUsed()); addNotifAboutQuota(relativeQuota); return true; @@ -139,7 +134,7 @@ public class AccountUserInfoWorker extends Worker { * - make message & title to be a parameter of the method, so we could reuse the function somewhere * - else with different notification. File conflict for example. **/ - private void addNotification(NotificationManager manager, String title, String text, boolean isOnGoing) { + private void addNotification(final NotificationManager manager, final String title, final String text, final boolean isOnGoing) { final NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), AppConstants.notificationChannelID) .setSmallIcon(android.R.drawable.stat_sys_warning) @@ -147,19 +142,20 @@ public class AccountUserInfoWorker extends Worker { .setContentText(text) .setOngoing(isOnGoing) .setStyle(new NotificationCompat.BigTextStyle().bigText(text)); - // Add as notification manager.notify(0, builder.build()); } private boolean fetchAliases(final OwnCloudClient client) { - final RemoteOperationResult ocsResult = getAliasOperation.execute(client); - String aliases = ""; - if (ocsResult.isSuccess() && ocsResult.getData() != null && !ocsResult.getData().isEmpty()) { - ArrayList alias = new ArrayList<>(ocsResult.getData().size()); - for (Object object : ocsResult.getData()) { - alias.add(object.toString()); - } - aliases = String.join(",", alias); + final RemoteOperationResult> ocsResult = getAliasOperation.execute(client); + if (!ocsResult.isSuccess()) { + return false; + } + final ArrayList aliasList = ocsResult.getResultData(); + final String aliases; + if (!aliasList.isEmpty()) { + aliases = String.join(",", aliasList); + } else { + aliases = ""; } accountManager.setUserData(account, ACCOUNT_DATA_ALIAS_KEY, aliases); return true; diff --git a/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java b/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java index 38ec32f06445505f260f340b9a78913bb5525db6..1a8ea515807c2ed80fbe58811f8b31e32ff82be6 100644 --- a/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java +++ b/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java @@ -56,6 +56,7 @@ public class CreateRemoteFolderWorker extends Worker { public Result doWork() { final Context context = getApplicationContext(); final Account account = getAccount(); + if (account == null) { Log.e(TAG, "Can't get valid account: stop everything"); return Result.failure(); @@ -85,7 +86,7 @@ public class CreateRemoteFolderWorker extends Worker { new CreateFolderRemoteOperation(syncedFolder.getRemoteFolder(), true); try { - final RemoteOperationResult result = mkcolRequest.execute(client, true); + final RemoteOperationResult result = mkcolRequest.execute(client); if (result.isSuccess() || result.getCode() == RemoteOperationResult.ResultCode.FOLDER_ALREADY_EXISTS) { if(DbHelper.insertSyncedFolder(syncedFolder, context) >= 0 ) { Log.d(TAG, "Insertion in DB succeed"); @@ -99,8 +100,8 @@ public class CreateRemoteFolderWorker extends Worker { } private SyncedFolder getSyncedFolderFromData() { - Data data = getInputData(); - SyncedFolder result = new SyncedFolder( + final Data data = getInputData(); + final SyncedFolder result = new SyncedFolder( data.getString(DATA_KEY_LIBELLE), data.getString(DATA_KEY_LOCAL_PATH), data.getString(DATA_KEY_REMOTE_PATH), @@ -118,7 +119,7 @@ public class CreateRemoteFolderWorker extends Worker { private Account getAccount() { - SharedPreferences prefs = getApplicationContext().getSharedPreferences(AppConstants.SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE); + final SharedPreferences prefs = getApplicationContext().getSharedPreferences(AppConstants.SHARED_PREFERENCE_NAME, Context.MODE_PRIVATE); final String accountName = prefs.getString(AccountManager.KEY_ACCOUNT_NAME, ""); final String accountType = prefs.getString(AccountManager.KEY_ACCOUNT_TYPE, ""); diff --git a/build.gradle b/build.gradle index 3378f0cd90a587b6f781e45f221ba00f97f51ebf..c8fef1e06bb7b91ed04c72e59667be29cb705739 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:4.1.3' - // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -18,7 +17,8 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() + maven { url "https://jitpack.io" } } } diff --git a/nextcloud-android-lib b/nextcloud-android-lib deleted file mode 160000 index b043a5104962a841daf4ca3e59383216eebf7ef0..0000000000000000000000000000000000000000 --- a/nextcloud-android-lib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b043a5104962a841daf4ca3e59383216eebf7ef0 diff --git a/settings.gradle b/settings.gradle index 19a2fc3db4027e847aaf59bf0c8f3a6f924d4615..e7b4def49cb53d9aa04228dd3edb14c9e635e003 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ -include ':app', ':NextcloudLib' -project(':NextcloudLib').projectDir = new File('nextcloud-android-lib') \ No newline at end of file +include ':app'