Skip to content

refactor(conflict-dialog): dialog determination - #17593

Merged
alperozturk96 merged 4 commits into
masterfrom
refactor/conflict-dialog-data
Sep 9, 2026
Merged

alperozturk96 merged 4 commits into
masterfrom
refactor/conflict-dialog-data

Conversation

@alperozturk96

@alperozturk96 alperozturk96 commented Sep 9, 2026 •

Copy link
Copy Markdown
Collaborator

Changes

  • Uses kotlinx.parcelize.Parcelize
  • Makes clear distinction between offline and normal via sealed class
  • Uses factory class to keep code more clear
  • Uses only conflict package

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 added the 鈾伙笍 refactor Refactor code (not a bug fix, not a feature just refactoring) label Sep 9, 2026
@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/34320674286/artifacts/10091919303
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

APK file: https://github.com/nextcloud/android/actions/runs/34322688810/artifacts/10092734745
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

Codacy

SpotBugs

CategoryBaseNew
Bad practice3535
Correctness5858
Dodgy code195195
Experimental11
Malicious code vulnerability22
Multithreaded correctness2626
Performance3737
Security1919
Total373373

@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

@daniele-verducci daniele-verducci left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you for the refactoring! Definitely more readable and mantainable! I tested it and it seems to match the previous behavior. Approved on my side 馃憤

@alperozturk96
alperozturk96 merged commit e35894d into master Sep 9, 2026
22 of 25 checks passed
@alperozturk96
alperozturk96 deleted the refactor/conflict-dialog-data branch September 9, 2026 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review 鈾伙笍 refactor Refactor code (not a bug fix, not a feature just refactoring)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants