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

Update sub-directories after rename

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-08-27 15:46:45 +02:00
parent a9e3ef99d0
commit 5fcebaef70
No known key found for this signature in database
GPG key ID: 4E577DC593B59BDF
3 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/client/database/dao/OfflineOperationDao.kt
View file

@ -33,4 +33,7 @@ interface OfflineOperationDao {
@Query("SELECT * FROM offline_operations WHERE offline_operations_path = :path LIMIT 1")
fun getByPath(path: String): OfflineOperationEntity?
@Query("SELECT * FROM offline_operations WHERE offline_operations_path LIKE :oldPath || '%'")
fun getSubDirs(oldPath: String): List<OfflineOperationEntity>
}

10
app/src/main/java/com/nextcloud/utils/extensions/OfflineOperationExtensions.kt
View file

@ -12,6 +12,16 @@ import com.nextcloud.client.database.entity.OfflineOperationEntity
private const val DELIMITER = '/'
fun OfflineOperationDao.updatePathAndSubPaths(oldPath: String, newPath: String) {
val operationsToUpdate = getSubDirs(oldPath)
operationsToUpdate.forEach { operation ->
val newOperationPath = operation.path?.replaceFirst(oldPath, newPath)
operation.path = newOperationPath
update(operation)
}
}
fun OfflineOperationDao.deleteSubDirIfParentPathMatches(filename: String) {
val targetPath = DELIMITER + filename + DELIMITER
getAll().forEach {

27
app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -77,7 +77,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import androidx.annotation.NonNull;
@ -147,12 +146,15 @@ public class FileDataStorageManager {
entity.setType(OfflineOperationType.CreateFolder);
offlineOperationDao.insert(entity);
createPendingDirectory(path);
return entity;
}
public void createPendingDirectory(String path) {
OCFile file = new OCFile(path);
file.setMimeType(MimeType.DIRECTORY);
saveFileWithParent(file, MainApp.getAppContext());
return entity;
}
public void deleteOfflineOperation(OCFile file) {
@ -162,8 +164,6 @@ public class FileDataStorageManager {
}
public void renameCreateFolderOfflineOperation(OCFile file, String newFolderName) {
deleteOfflineOperation(file);
OCFile parentFolder = getFileById(file.getParentId());
if (parentFolder == null) {
return;
@ -171,17 +171,18 @@ public class FileDataStorageManager {
String newPath = parentFolder.getDecryptedRemotePath() + newFolderName + OCFile.PATH_SEPARATOR;
String oldPath = parentFolder.getDecryptedRemotePath() + file.getFileName() + OCFile.PATH_SEPARATOR;
OfflineOperationExtensionsKt.updatePathAndSubPaths(offlineOperationDao, oldPath, newPath);
String uploadedParentPath = null;
if (Objects.equals(parentFolder.getRemotePath(), OCFile.PATH_SEPARATOR)) {
uploadedParentPath = OCFile.PATH_SEPARATOR;
}
// Delete old parent
removeFile(file, true, true);
OfflineOperationEntity entity = addCreateFolderOfflineOperation(newPath, newFolderName, uploadedParentPath, file.getParentId());
String newTopDir = OfflineOperationExtensionsKt.getTopParentPathFromPath(entity);
// Create new parent
createPendingDirectory(newPath);
if (newTopDir != null) {
OfflineOperationExtensionsKt.updatePathsIfParentPathMatches(offlineOperationDao, oldPath, newTopDir, entity.getParentPath());
// Create updated sub-directories
var subDirs = offlineOperationDao.getSubDirs(newPath);
for (OfflineOperationEntity entity: subDirs) {
createPendingDirectory(entity.getPath());
}
}