Skip to content
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

Jump to bottom

Feature - Check Auto Upload Sub Folder #14547

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Feature - Check Auto Upload Sub Folder #14547

wants to merge 21 commits into from
+302 −19

Conversation

alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Feb 13, 2025 •
edited
Loading

  • Tests written, or not not needed

Screenshot 2025-03-12 at 10 20 03

Sorry, something went wrong.

@alperozturk96 alperozturk96 linked an issue Feb 13, 2025 that may be closed by this pull request
Enhancing Auto-Upload Functionality: Preventing Redundant Sub-Folder Uploads #14462
Open
@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch 2 times, most recently from 2bb8991 to 3bc227d Compare February 18, 2025 12:31
@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch 2 times, most recently from 96caffc to ff29eb2 Compare February 21, 2025 10:36
@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch 2 times, most recently from 2d57ed3 to 0b2f161 Compare March 4, 2025 14:20
@tobiasKaminsky
Copy link
Member

as discussed

  • do not automatically change it
  • show an info it auto upload overview

@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch from 0b2f161 to f68d67b Compare March 5, 2025 12:28
@alperozturk96
Copy link
Collaborator Author

Info image button added to the auto upload page. @ZetaTom @tobiasKaminsky Please review

fff.mp4

jancborchardt
jancborchardt requested changes Mar 10, 2025
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In both cases where it appears – but especially when clicking the info "i" icon – it would be more fitting to use a modal since the info is more important than to just show it in a toast.

@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch 2 times, most recently from 2a713f7 to c0130f9 Compare March 11, 2025 09:20
@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch from c0130f9 to 9d0783e Compare March 12, 2025 08:29
alperozturk96
alperozturk96 commented Mar 12, 2025
View reviewed changes
app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.kt
if (titleIconId == defaultTitleIconId) {
builder
.setIcon(titleIconId)
.setIconAttribute(R.attr.alertDialogIcon)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only setIconAttribute for defaultTitleIconId otherwise it will override given titleIconId

jancborchardt
jancborchardt approved these changes Mar 13, 2025
View reviewed changes
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the adjustments @alperozturk96! :)

@alperozturk96 alperozturk96 mentioned this pull request Mar 14, 2025
Open
@alperozturk96
use lifecycleScope
fa27928 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add getEnabledOrWithoutEnabledParent extension for List<SyncedFolderD…
439f387 
…isplayItem>

Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
use extension
3fc9125 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add removeAutoUploadFromSubFoldersWithEnabledParent
8eb7b79 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add documentations to the functions and use better function names
8860248 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add documentations to the functions and use better function names
be0a129 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
check isGivenLocalPathHasEnabledParent
88f2929 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add tests
426df35 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add missing import
dc48118 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
inform user and remove auto delete
2423117 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
rename imagebutton
f410ef0 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
fix code analytics
76e3fe4 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
show alert dialog instead of snackbar
88c33cb 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
change title, title icon and positive button text
bc048d6 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
add tint for title icon
dd503d2 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
fix code analytics
802f450 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
change positiveButtonTextId for overview page
6b78844 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 force-pushed the feature/check-auto-upload-sub-folder branch from 55b01f9 to 6b78844 Compare March 19, 2025 11:13
@alperozturk96 alperozturk96 marked this pull request as draft March 19, 2025 11:30
@alperozturk96
check parents recursively to determine sub folder of sub folders
d9b801a 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
fixes
6bc34e5 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
remove test due to file existance check
31ed95a 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96
fix code analytics
e31d1c2 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 marked this pull request as ready for review March 19, 2025 14:11
@github-actions GitHub Actions
Copy link

Codacy

Lint

TypemasterPR
Warnings5454
Errors1111

SpotBugs

CategoryBaseNew
Bad practice6565
Correctness5858
Dodgy code292292
Experimental11
Internationalization77
Malicious code vulnerability11
Multithreaded correctness77
Performance5151
Security1818
Total500500

@github-actions GitHub Actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14547.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jancborchardt jancborchardt

@tobiasKaminsky tobiasKaminsky

@ZetaTom ZetaTom

@AndyScherzinger AndyScherzinger

Assignees
No one assigned
Labels
3. to review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Enhancing Auto-Upload Functionality: Preventing Redundant Sub-Folder Uploads
3 participants
@alperozturk96 @tobiasKaminsky @jancborchardt