Skip to content

Use new auto folder creation feture available since Nextcloud 32 #17618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daniele-verducci wants to merge 9 commits into
base: master
Choose a base branch
from
+71 −50
Open

Use new auto folder creation feture available since Nextcloud 32 #17618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2734df5
feature/create-folder-during-upload: use new auto folder creation fea…
daniele-verducci Sep 11, 2026
0dcc1b4
Updated android-library
daniele-verducci Sep 14, 2026
d92016b
Working new auto folder creation feature on uploads
daniele-verducci Sep 14, 2026
47fbc33
Apply suggestion from @alperozturk96
daniele-verducci Sep 15, 2026
8924ac6
Use isOlderThan on capabilities for code readability
daniele-verducci Sep 15, 2026
66e0c5d
Rebased
daniele-verducci Sep 15, 2026
e9a612a
Moved dir tree creation to extensions (automatic java to kotlin conve…
daniele-verducci Sep 16, 2026
fdf5b4b
Refactored converted kotlin to a more idiomatic one
daniele-verducci Sep 16, 2026
3d0053b
Create local folders metadata to reflect server's auto folder creation
daniele-verducci Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import com.owncloud.android.lib.resources.files.model.RemoteFile
import com.owncloud.android.lib.resources.shares.OCShare
import com.owncloud.android.lib.resources.status.OCCapability
import com.owncloud.android.utils.FileStorageUtils
import com.owncloud.android.utils.MimeType
import com.owncloud.android.utils.MimeTypeUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -185,6 +186,36 @@ fun FileDataStorageManager.moveFiles(ocFile: OCFile?, targetPath: String, target
}
}

fun FileDataStorageManager.createDirectoryTree(remotePath: String, createdRemoteFolder: RemoteFile?) {
if (getFileByEncryptedRemotePath(FileStorageUtils.getParentPath(remotePath)) == null) {
// When parent of remote path is not created
val subFolders = remotePath.split(OCFile.PATH_SEPARATOR.toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
var composedRemotePath = OCFile.ROOT_PATH

// For each ancestor folders create them recursively
for (subFolder in subFolders) {
if (subFolder.isNotEmpty()) {
composedRemotePath = composedRemotePath + subFolder + OCFile.PATH_SEPARATOR
createDirectoryTree(composedRemotePath, createdRemoteFolder)
}
}
} else {
// Create directory on DB
with(OCFile(remotePath)) {
mimeType = MimeType.DIRECTORY
val parentId: Long = getFileByEncryptedRemotePath(FileStorageUtils.getParentPath(remotePath)).getFileId()
setParentId(parentId)
remoteId = createdRemoteFolder?.remoteId
modificationTimestamp = System.currentTimeMillis()
isEncrypted = FileStorageUtils.checkEncryptionStatus(this, this@createDirectoryTree)
permissions = createdRemoteFolder?.permissions
saveFile(this)
}

Log_OC.d(FileDataStorageManager.TAG, "createDirectoryTree: created $remotePath in Database")
}
}

@Suppress("ReturnCount")
private fun moveLocalFiles(accountName: String, ocFile: OCFile, defaultSavePath: String, targetPath: String): Boolean {
val localFile = File(FileStorageUtils.getDefaultSavePathFor(accountName, ocFile))
Expand Down
29 changes: 2 additions & 27 deletions app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.nextcloud.client.account.User;
import com.nextcloud.utils.e2ee.E2ECounterHelper;
import com.nextcloud.utils.e2ee.E2EVersionHelper;
import com.nextcloud.utils.extensions.FileDataStorageManagerExtensionsKt;
import com.nextcloud.utils.extensions.OCFileExtensionsKt;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
Expand Down Expand Up @@ -552,33 +553,7 @@ private void onCreateRemoteFolderOperationFinish(RemoteOperationResult result) {
* Save new directory in local database.
*/
private void saveFolderInDB() {
if (getStorageManager().getFileByPath(FileStorageUtils.getParentPath(remotePath)) == null) {
// When parent of remote path is not created
String[] subFolders = remotePath.split(PATH_SEPARATOR);
String composedRemotePath = ROOT_PATH;

// For each ancestor folders create them recursively
for (String subFolder : subFolders) {
if (!subFolder.isEmpty()) {
composedRemotePath = composedRemotePath + subFolder + PATH_SEPARATOR;
remotePath = composedRemotePath;
saveFolderInDB();
}
}
} else {
// Create directory on DB
OCFile newDir = new OCFile(remotePath);
newDir.setMimeType(MimeType.DIRECTORY);
long parentId = getStorageManager().getFileByPath(FileStorageUtils.getParentPath(remotePath)).getFileId();
newDir.setParentId(parentId);
newDir.setRemoteId(createdRemoteFolder.getRemoteId());
newDir.setModificationTimestamp(System.currentTimeMillis());
newDir.setEncrypted(FileStorageUtils.checkEncryptionStatus(newDir, getStorageManager()));
newDir.setPermissions(createdRemoteFolder.getPermissions());
getStorageManager().saveFile(newDir);

Log_OC.d(TAG, "Create directory " + remotePath + " in Database");
}
FileDataStorageManagerExtensionsKt.createDirectoryTree(getStorageManager(), remotePath, createdRemoteFolder);
}

public String getRemotePath() {
Expand Down
61 changes: 38 additions & 23 deletions app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.nextcloud.utils.autoRename.AutoRename;
import com.nextcloud.utils.e2ee.E2ECounterHelper;
import com.nextcloud.utils.e2ee.E2EVersionHelper;
import com.nextcloud.utils.extensions.FileDataStorageManagerExtensionsKt;
import com.nextcloud.utils.extensions.RemoteOperationResultExtensionsKt;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
Expand Down Expand Up @@ -55,6 +56,7 @@
import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation;
import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
import com.owncloud.android.lib.resources.files.model.RemoteFile;
import com.owncloud.android.lib.resources.status.NextcloudVersion;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.operations.common.SyncOperation;
import com.owncloud.android.operations.e2e.E2EClientData;
Expand Down Expand Up @@ -474,45 +476,58 @@ protected RemoteOperationResult run(OwnCloudClient client) {
Log_OC.d(TAG, "parent lookup for path: " + remoteParentPath + " → " +
(parent == null ? "not found in DB" : "found, id=" + parent.getFileId()));

final boolean isResumingEncryptedUpload = (mFolderUnlockToken != null && !mFolderUnlockToken.isEmpty());
if (!isResumingEncryptedUpload && (parent == null || mRemoteFolderToBeCreated)) {
Log_OC.d(TAG, "verifying remote parent folder exists: " + remoteParentPath);
final var result = grantFolderExistence(remoteParentPath, client);

if (!result.isSuccess()) {
Log_OC.e(TAG, "grantFolderExistence failed for: " + remoteParentPath + ", code: " +
result.getCode() + ", message: " + result.getMessage());
return result;
// Create folders only for Nextcloud < 32; 32+ handles this automatically.
if (getCapabilities().getVersion().isOlderThan(NextcloudVersion.nextcloud_32)) {
final boolean isResumingEncryptedUpload = (mFolderUnlockToken != null && !mFolderUnlockToken.isEmpty());
if (!isResumingEncryptedUpload && (parent == null || mRemoteFolderToBeCreated)) {
Log_OC.d(TAG, "verifying remote parent folder exists: " + remoteParentPath);
final var result = grantFolderExistence(remoteParentPath, client);
Comment thread
daniele-verducci marked this conversation as resolved.

if (!result.isSuccess()) {
Log_OC.e(TAG, "grantFolderExistence failed for: " + remoteParentPath + ", code: " +
result.getCode() + ", message: " + result.getMessage());
return result;
}

parent = getStorageManager().getFileByPath(remoteParentPath);
if (parent == null) {
Log_OC.e(TAG, "parent still null after grantFolderExistence: " + remoteParentPath);
return new RemoteOperationResult<>(ResultCode.UNKNOWN_ERROR);
}

Log_OC.d(TAG, "remote parent folder confirmed: " + remoteParentPath + ", id=" + parent.getFileId());
}

parent = getStorageManager().getFileByPath(remoteParentPath);
if (parent == null) {
Log_OC.e(TAG, "parent still null after grantFolderExistence: " + remoteParentPath);
return new RemoteOperationResult<>(ResultCode.UNKNOWN_ERROR);
Log_OC.e(TAG, "parent is null, cannot proceed: " + remoteParentPath + "," + " unlock token: " + mFolderUnlockToken);
return new RemoteOperationResult<>(false, "Parent folder not found", HttpStatus.SC_NOT_FOUND);
}

Log_OC.d(TAG, "remote parent folder confirmed: " + remoteParentPath + ", id=" + parent.getFileId());
}

if (parent == null) {
Log_OC.e(TAG, "parent is null, cannot proceed: " + remoteParentPath + "," + " unlock token: " + mFolderUnlockToken);
return new RemoteOperationResult<>(false, "Parent folder not found", HttpStatus.SC_NOT_FOUND);
}

// - resume of encrypted upload, then parent file exists already as unlock is only for direct parent
mFile.setParentId(parent.getFileId());

// check if any parent is encrypted
encryptedAncestor = FileStorageUtils.checkEncryptionStatus(parent, getStorageManager());
mFile.setEncrypted(encryptedAncestor);
if (encryptedAncestor && parent != null) {
// - resume of encrypted upload, then parent file exists already as unlock is only for direct parent
mFile.setParentId(parent.getFileId());
}

RemoteOperationResult result;
if (encryptedAncestor) {
Log_OC.d(TAG, "⬆️🔗" + "encrypted upload");
return encryptedUpload(client, parent);
result = encryptedUpload(client, parent);
} else {
Log_OC.d(TAG, "⬆️" + "normal upload");
return normalUpload(client);
result = normalUpload(client);
}

if (result.isSuccess() && getCapabilities().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
// Add the folders that the server creates automatically (from Nextcloud 32) to local db
FileDataStorageManagerExtensionsKt.createDirectoryTree(getStorageManager(), remoteParentPath, null);
}

return result;
}

// region E2E Upload
Expand Down
Loading