Skip to content

Commit 3973176

Browse files
committed
simplify sync file calls
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 8df15f9 commit 3973176

File tree

8 files changed

+15
-11
lines changed

8 files changed

+15
-11
lines changed

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2212,7 +2212,7 @@ class FileDisplayActivity :
22122212

22132213
// download new version, only if file was previously download
22142214
showSyncLoadingDialog(file.isFolder)
2215-
fileOperationsHelper.syncFileOrFolder(file, false)
2215+
fileOperationsHelper.syncFileOrFolder(file)
22162216
}
22172217

22182218
val parent = file?.let { storageManager.getFileById(it.parentId) }

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,11 @@ private void optionsItemSelected(@IdRes final int itemId) {
462462
dialog.show(getFragmentManager(), FTAG_RENAME_FILE);
463463
} else if (itemId == R.id.action_cancel_sync) {
464464
((FileDisplayActivity) containerActivity).cancelTransference(getFile());
465-
} else if (itemId == R.id.action_download_file || itemId == R.id.action_sync_file || itemId == R.id.action_sync_all_files) {
465+
} else if (itemId == R.id.action_download_file || itemId == R.id.action_sync_file) {
466466
if (containerActivity instanceof FileActivity activity) {
467467
activity.showSyncLoadingDialog(getFile().isFolder());
468468
}
469-
boolean syncAll = (itemId == R.id.action_sync_all_files);
470-
containerActivity.getFileOperationsHelper().syncFileOrFolder(getFile(), syncAll);
469+
containerActivity.getFileOperationsHelper().syncFileOrFolder(getFile());
471470
} else if (itemId == R.id.action_export_file) {
472471
ArrayList<OCFile> list = new ArrayList<>();
473472
list.add(getFile());

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2233,7 +2233,7 @@ private boolean isSearchEventSet(SearchEvent event) {
22332233

22342234
private void syncFolderIncludingAllNestedFiles(OCFile folder) {
22352235
if (FileStorageUtils.checkIfEnoughSpace(folder)) {
2236-
mContainerActivity.getFileOperationsHelper().syncFileOrFolder(folder, false, true);
2236+
mContainerActivity.getFileOperationsHelper().syncFolderIncludingNestedFiles(folder);
22372237
} else {
22382238
SyncFileNotEnoughSpaceDialogFragment
22392239
.newInstance(folder, FileOperationsHelper.getAvailableSpaceOnDevice())

app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -877,8 +877,12 @@ public void syncFileOrFolder(OCFile file, boolean postDialogEvent, boolean syncA
877877
}
878878
}
879879

880-
public void syncFileOrFolder(OCFile file, boolean syncAll) {
881-
syncFileOrFolder(file, false, syncAll);
880+
public void syncFileOrFolder(OCFile file) {
881+
syncFileOrFolder(file, false, false);
882+
}
883+
884+
public void syncFolderIncludingNestedFiles(OCFile file) {
885+
syncFileOrFolder(file, false, true);
882886
}
883887

884888
private void startSyncFolderIntent(ServerFileInterface file, boolean syncAll) {
@@ -887,6 +891,7 @@ private void startSyncFolderIntent(ServerFileInterface file, boolean syncAll) {
887891
intent.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
888892
intent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
889893
intent.putExtra(OperationsService.EXTRA_SYNC_ALL, syncAll);
894+
890895
fileActivity.startService(intent);
891896
}
892897

app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ class PreviewImageFragment :
415415
val activity = containerActivity as FileActivity
416416
activity.showSyncLoadingDialog(file.isFolder)
417417
}
418-
containerActivity.fileOperationsHelper.syncFileOrFolder(file, false)
418+
containerActivity.fileOperationsHelper.syncFileOrFolder(file)
419419
} else if (itemId == R.id.action_cancel_sync) {
420420
containerActivity.fileOperationsHelper.cancelTransference(file)
421421
} else if (itemId == R.id.action_set_as_wallpaper) {

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ class PreviewMediaActivity :
584584

585585
R.id.action_sync_file -> {
586586
showSyncLoadingDialog(file?.isFolder == true)
587-
fileOperationsHelper.syncFileOrFolder(file, false)
587+
fileOperationsHelper.syncFileOrFolder(file)
588588
}
589589

590590
R.id.action_cancel_sync -> {

app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class PreviewMediaFragment :
393393

394394
R.id.action_sync_file -> {
395395
getTypedActivity(FileActivity::class.java)?.showSyncLoadingDialog(file.isFolder)
396-
containerActivity.fileOperationsHelper.syncFileOrFolder(file, false)
396+
containerActivity.fileOperationsHelper.syncFileOrFolder(file)
397397
}
398398

399399
R.id.action_cancel_sync -> {

app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ private void onFileActionChosen(final int itemId) {
306306
if (containerActivity instanceof FileActivity activity) {
307307
activity.showSyncLoadingDialog(getFile().isFolder());
308308
}
309-
containerActivity.getFileOperationsHelper().syncFileOrFolder(getFile(), false);
309+
containerActivity.getFileOperationsHelper().syncFileOrFolder(getFile());
310310
} else if(itemId == R.id.action_cancel_sync){
311311
containerActivity.getFileOperationsHelper().cancelTransference(getFile());
312312
} else if (itemId == R.id.action_edit) {

0 commit comments

Comments
 (0)