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

Use decrypted path in Conflict Resolve Dialog #14704

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use decrypted path in Conflict Resolve Dialog #14704

wants to merge 1 commit into from

Conversation

alperozturk96
Copy link
Collaborator

@alperozturk96 alperozturk96 commented Mar 18, 2025 •
edited
Loading

  • Tests written, or not not needed

Before

Image 1

 After

Image 2

@alperozturk96 alperozturk96 linked an issue Mar 18, 2025 that may be closed by this pull request
Use DecryptedPath for E2EE Files #14473
Open
@alperozturk96 alperozturk96 enabled auto-merge March 19, 2025 14:13
@alperozturk96 alperozturk96 force-pushed the use-decrypted-path-for-e2ee-files-in-conflict-resolve-dialog branch from 8130be7 to 3e8e6b7 Compare March 19, 2025 14:13
@alperozturk96 alperozturk96 force-pushed the use-decrypted-path-for-e2ee-files-in-conflict-resolve-dialog branch from 3e8e6b7 to 602f008 Compare March 20, 2025 08:12
@alperozturk96
use decrypted path
572b498 
Signed-off-by: alperozturk <[email protected]>
@alperozturk96 alperozturk96 force-pushed the use-decrypted-path-for-e2ee-files-in-conflict-resolve-dialog branch from 602f008 to 572b498 Compare March 24, 2025 09:58
@github-actions GitHub Actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/14704.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.

@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

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

@tobiasKaminsky tobiasKaminsky tobiasKaminsky approved these changes

@ZetaTom ZetaTom Awaiting requested review from ZetaTom

@AndyScherzinger AndyScherzinger Awaiting requested review from 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.

Use DecryptedPath for E2EE Files
2 participants
@alperozturk96 @tobiasKaminsky