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.

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

Fixes #3938 #3941

Merged
merged 1 commit into from
Oct 29, 2023
Merged

Fixes #3938 #3941

merged 1 commit into from
Oct 29, 2023

Conversation

yatiksihag01
Copy link
Contributor

@yatiksihag01 yatiksihag01 commented Sep 27, 2023

Description

  • Fixed renaming issue while pasting conflicting files multiple times in same set of two directories.
  • Disabled overwrite button if pasting in same directory. In previous implementation, we were showing users a Toast message if they try to overwrite a file in same directory. This new method seems more concise and more expressive.
  • Set dialog shown during conflict resolution non-cancellable. This change ensures that users won't accidentally lose progress if they tap elsewhere on the screen.

Issue tracker

Fixes #3938

Automatic tests

  • Added test cases

Manual tests

  • Done
  • Device: Samsung Galaxy A13
  • OS: Android 13

Build tasks success

Successfully running following tasks on local:

  • ./gradlew assembledebug
  • ./gradlew spotlessCheck

Related PR

Related to PR #3898

Disables overwrite button if pasting in same directory.
Sets dialog shown during conflict resolution to not cancellable.
@yatiksihag01
Copy link
Contributor Author

Disabled overwrite button if pasting in same directory. In previous implementation, we were showing users a Toast message if they try to overwrite a file in same directory. This new method seems more concise and more expressive.

@VishnuSanal tell me what you think about it. Should we keep this implementation or the previous one in which we were showing a toast message.

@VishnuSanal
Copy link
Member

VishnuSanal commented Oct 3, 2023

Disabled overwrite button if pasting in same directory. In previous implementation, we were showing users a Toast message if they try to overwrite a file in same directory. This new method seems more concise and more expressive.

@VishnuSanal tell me what you think about it. Should we keep this implementation or the previous one in which we were showing a toast message.

@yatiksihag01 I vote for the new implementation. #3938 is fixed & works perfect! Consider this an approval from my side, let @VishalNehra & @TranceLove give approvals before merging.

PS: please fix the CI :)

PPS: apologies for the long hiatus in reviewing

@yatiksihag01
Copy link
Contributor Author

Execution failed for task ':app:testPlayDebugUnitTest'.
Process 'Gradle Test Executor 27' finished with non-zero exit value 10
This problem might be caused by incorrect test process configuration.

I examined CI logs and found that this issue appears to be related to a org.gradle.api.tasks.TaskExecutionException. As you can see it suggest that error might be caused by incorrect test configuration. But I didn't change any test configuration. Additionally, there is limited online information available regarding the meaning of exit code 10. Initially Executor 27 initiated the test execution but finished with exit code 10 after the subsequent executors 28, 29,.., 31 had completed their tasks..
@VishnuSanal, @VishalNehra & @TranceLove any idea how can I fix it?

@VishnuSanal
Copy link
Member

@yatiksihag01 I re-ran the CI & apparently it passes. @TranceLove please confirm whether we can ignore the previous failure.

@VishalNehra VishalNehra merged commit 4453863 into TeamAmaze:release/4.0 Oct 29, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Debug Bug] Renaming a file before copying breaks File Renaming
3 participants