fix: conflict resolve activity #15983
Draft
+160
−139
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
alperozturk96
force-pushed
the
fix/conflict-resolve-activity
branch
from
6c9ec7f to
60697bc
Compare
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
|
test-Unit test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/15983-Unit-test-10-28 |
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/15983.apk |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes
Fixes existingFile initialization previously,
EXTRA_EXISTING_FILEwas never set, causingexistingFileto always have a file ID of -1L. With this PR,existingFileis properly initialized, ensuring correct file references throughout the flow.Removes
newFileto simplify logic, thenewFilevariable was misleading, it actually referred to a file fromFileActivity. File refers to the newly selected file from local storage.Fixes
keepLocalbehavior.keepLocalmust just do, removes the existing remote file and uploads the newly selected local file. Thus, thumbnail and preview of the new file will appear correctly.