[pull] master from owncloud:master - #151

* I updated it to match my current understanding but the url produced by the oauth step does not seem to really work when pasted into a browser
maybe I'm doing it wrong but at least we can clearly see what oauth produces

* reordered the layout of the error and full auth url fields to ensure the error will always be visible

* removed a few dead comments and added missing type decl for the advanced settings

* various cleanup and improvements to error messages
Note! There is a bunch of junk in the gui impl since we're not 100% sure what the final design will be. Once we have decided I will clean that up.
key point is the copy button takes the correct info for whatever purpose.

* fixed the "weird text" top left of oauth page

* added a forced repaint after updating the auth url so there is less chance that the user sees it in an "intermediate state" while opening the browser
note in my experience, mac does not always honor forced repaint so maybe it helps, maybe not.

* deleted dead gui elements
also fixed a small bug that left the copy button with no tooltip on first pass

… client (#12230)

automante branded client - update test for syncing

* Remove OC10 support from ETagWatcher
* Listen for `spaceChanged` signal to update the etag. No extra polling is needed anymore.
* Key the EtagInfo map on the space id
* Move lambda to separate slot for readability

And make it clear why this class exists: so we can clone it for cases
where we don't want to spoil the original jar.

Co-authored-by: modSpike <lisa.reese@kiteworks.com>

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…2252)

fixed a bug in the settings dialog account handling that always left the first account selected when a new account was added.
also added a separate step that sets the active account to the "first" one in the account manager's list after loading existing accounts.
also refactored the accountAdded/Removed handlers out into real slots and renamed the vague "addAccount" function called from qml to createNewAccount for clarity

* test new account connection wizard

* ci: test the correct account being displayed

---------

Co-authored-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

delete oc10 related test codes

Fix leak of `AccountState`

…nfinite Scale (#12093)

remove trigger for branch 5

This typedef was a left-over from long ago. If a class stores the
`AccountState` as a member field, it is responsible for wrapping it
in a `QPointer`.

#12270)

feat: Qt6.8 is now minimum version and brings minimum deployment target for MacOS to 12

Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com>

* Remove "version blockers"

These were introduced in version 5 to prevent older versions from
loading and possibly changing the configuration files. We do not
support downgrading anymore, and client versions before 5.0 are also not
supported anymore.

* Remove legacy settings loading

This code was used to load pre-2.4 settings. Latest substantial changes
were from 2018.

* Move `ignoreHiddenFiles` from folder to global settings

* Move `ignoreHiddenFiles` loading/saving back to `FolderMan`

Changing this will also pause/unpause the scheduler.

* change background of url field to match button background
set error text to font size 14.
both need to be tested on other platforms to make a final decision

* updated colors for radio buttons on oc branding. need to validate I didn't break kiteworks but it should be ok I think
also did the "show all radio buttons but disable some of them depending..." impl and it's not great, given the disabled colors are as yet unknown. I think we will have to make them up for branded versions. ick.

* this is related more towards DC-101 as it covers the disabled color for radio buttons on branding that uses a background color

* small cleanup

* typo

* finally decided to just disable the radio button when it's force vfs

ci: fix python modules path

Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com>

* [DC-25] feat: new OAuth redirect html page

* test: adjust test on OAuth html page

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

let qt pick the style to use on windows

fix(ci): set changelog workflow permissions to read-all

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

chore: add standardized dependabot config

Weekly Sunday 22:00 UTC, 5 PR limit per ecosystem, minor+patch grouped.

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

This uses a cloned craft repository, because the OpenSSL blueprint is
part of craft itself.

* started moving folder management functions

to new static class. static class was chosen over namespace to ensure *all* related decls and defs are in one file.

* fix windows build

missing tr function

* more windows fixes

* hopefully finished with the local folder precheck

also added a new, still empty folder builder shell as this will be used to construct the folder deps so they can be injected to the ctr instead of all this crazy code in the ctr itself

* fix windows

* fixed some docs to be more specific

* fixed the tests

"fixed" is relative, as the tests in this area are confusing and I worry some results are not correct.

The tests are "fixed" insofar as the necessary prerequisite for calling addFolder is now fulfilled (ie the local folder actually exist on disk before calling addFolder)

* builder now creates vfs and journal

also started cleaning up the crazy variety of smart pointers and refs related to these types. They are all QObject subs so the goal is that they should be owned by Folder, and wrapped in QPointer in other folder related classes that "need" them.

* attempting to kill the shared pointer around vfs

so far so good but if there are deeper problems they will assuredly show up on windows

* ci: re-enable winvfs tests (#12515)

* Limit number of parallel test to 1 on Windows

This should prevent interference between tests that register/unregister
syncroots with CfApi.

* Revert "Temporarily disable WinVFS tests (#12469)"

This reverts commit 10f6f69.

* Revert "[DC-270] Disable WinVfs test itself (#12470)"

This reverts commit f5f1b22.

* chore: update translations from transifex (#12517)

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

* ci: use reusable calens workflow from reusable-workflows (#12514)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

* hoping the tests build now for win

and PASS!

* this is a temporary fix - the core issue is that the tests are way out of line with reality in terms of vfs instance ownership (side effect of never really caring in favor of using QSharedPointer, which is exactly why we should not use shared pointers unless there is true deomonstrated need!)

exacerbating the problem is that the FakeFolder::switchToVfs impl shares just a few bits on common with the real Folder::changeVfsMode that in my personal opinion it's not really testing modern behavior of the subsystem at all. This needs deep review.

* ci: rename calens GitHub App secrets to CALENS_APP_ID/KEY (#12518)

* ci: rename calens GitHub App secrets to CALENS_APP_ID/KEY

* ci: rename calens GitHub App secrets to APP_ID/APP_PRIVATE_KEY

* fixing new tests crash on mac after fix on win

I hope this finally fixes the alternating crashes on win vs mac - it's still just a bandaid until we review and fix these tests, especially the fake folder impl.

* start preparing to eliminate the SyncOptions

these are all over the place and it's often the case that one or other values are needed but not all.

key point is it carries the vfs pointer which we want to restrict as much as possible. now that is private with getter only, and checks have been added for nullptr on all consumers that arise from SyncOptions (so far).

got rid of dead regex related stuff in syncoptions so now all that is left is the vfs pointer, move to trash and parallel network job count

* chore: update translations from transifex (#12522)

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

* more

got rid of the godforesaken shared pointer on the propagator in sync engine -> this will hopefully fix the linux tests but let's see

also removed the handling of moveToTrash from the sync options, they should now be handled similar to ignoreHiddenFiles

* continuing to update various deps inside the SyncEngine

as we have seen in other areas of the app, smart pointers of various types where used in many cases, then directly managed anyway (ie reset a shared pointer and create a new instance regularly). I still see zero justification for using smart pointers, so I'm replacing them with  QPoiner (if dep is injected) or raw pointer (if owned) and ensuring the qobject parenting is in place to ensure natural cleanup of any strays.

tests continue to be a problem but the failures are so bizarre I'm just going to ignore them for now becasue it's sucking up far too much effort to baby test code that is highly questionable to begin with

* another incremental commit to check build results

hopefully getting rid if syncEngine in VfsSetupParams, got rid of the smart pointers in the tests FakeFolder (to be more in line with real life), sync engine now takes a parent, etc.

* put the sync engine back in VfsSetupParams to support winvfs

* fix the squish tests?

closing the journal after it's been opened is reallllly bad so that goes. Hopefully this helps the squish tests.

also adding a switch to the ci build that hopefully continues to build and tests all targets even if one failed

* hopefully fix win build

* possible fix for linux tests

* removed the last of the smart pointers from SyncEngine

* eliminated strange getters that returned refs instead of pointers

whose result was often turned back into a pointer

* try to make win tests build

* more wintest fixes

* it never ends

* chore: update translations from transifex (#12524)

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

* another try to build winvfs tests

* refactor: [DC-294] let qt pick the style to use on windows (#12526)

let qt pick the style to use on windows

* disable the databaseError test for now

it loops for a very long time, which makes it really hard to debug to find the source of the problem. I just don't have the spare mental capacity for this right now so it's on the back burner, especially as no one currently understands the actual purpose of the test in the first place. Will revisit later.

* encapsulated SyncFileStatusTracker within SyncEngine

renamed a couple of slots, too, for better readability

* further tightening of SyncEngine and SyncFileStatusTrackerand Sy

got rid of accessor for journal (get it from the folder if you must), replaced signals to child objects with direct calls, and set up SyncFileStatusTracker with *actual* deps instead of relying on internal knowledge of syncEngine to pass these around.

* feat: Bump version to 7.2 (#12531)

* update FolderBuilder::buildEngine

note the check for engine able to load exludes breaks the tests, we are fixing that in a separate step

* make the webDavUrl consistent

it sometimes had a trailing '/' and sometimes not. now it should never have it (pre-exisiting config values with the '/' are cleaned up on loading the config)

* updated FolderMan to handle moveToTrash more like ignoreHiddenFiles

avoid extra "hits" on the config by keeping the value in memory, let the folderman read and set the settings

* feat: Move excludes list into a resource (#12533)

* trying to fine tune some of the propagator handling

we have a crash when pausing the sync on upload only, I'm trying to suss it out, and also refining the timing of when the propagator is deleted. the main problem with leaving it around "too long" is that when a sync is aborted, the propagator triggers a second finalize in the sync engine, which crashes. I may move the delete to the abort routine but let's see

* refining the management of discovery and propagation in SyncEngine

the DatabaseErrorTest is no magically passing again so I must have done something right ;)

* primarily cleanup

moving some functions around and finished parting out the propagation step from old discovery finished handler. now the steps are easily found.

* fix(ci): set changelog workflow permissions to contents: read (#12537)

fix(ci): set changelog workflow permissions to read-all

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

* replaced QFAIL with asserts

per earlier review feedback

* tightened up checks on the database

added checks to ensure the _journal is still functioning at each stage of the sync process.

With these changes it seems previous crashes related to removing a folder or account while sync is in progress are now gone.

* fixing up one of the test changes

* fixed databaseerrortest again

* hopefully final cleanup

final sweep:
removed dead code
removed dead comments
added a few new comments
made sure on classes that *need* a parent don't default to parent = nullptr in the decl

AND! put the yaml back to stop building on first failure

* chore: update dependabot to weekly Sunday schedule (#12539)

chore: add standardized dependabot config

Weekly Sunday 22:00 UTC, 5 PR limit per ecosystem, minor+patch grouped.

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

* chore: update translations from transifex (#12527)

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

* chore: Bump OpenSSL version to 3.4.5 (#12538)

This uses a cloned craft repository, because the OpenSSL blueprint is
part of craft itself.

* address review comments

---------

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Co-authored-by: Erik Verbruggen <erik.verbruggen@kiteworks.com>
Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>
Co-authored-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

use actions/upload-artifact

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

…w relative to the "top bar" (#12540)

* just added some placeholders for where this is going

* added switch to show new main window

new main win is currently empty.
To show it uncomment #define USE_NEW_MAIN_WINDOW in owncloudgui.h

* started the more menu button impl

fleshing out the new MainWindow and MainWindowController to replace old stuff

* mini commit

also fixes squish

* cmake correction

* new modal mode for main win

also new simplified about view. Update functionality has been removed and it's just a widget now

* add settings action

* added accounts to the toolbar

also added the settings view to menu

* reauth routine now works in new gui

removed hard deps on main window/account view in the RequestAuthenticationController, too.

* new account action mostly works now

still need to implement showing the folder wizard when selective sync is used, but for most common workflow it's working now.

* fix the build

* account modal widget updates

got rid of the "legacy" modal dialog thing in account view
updated addFolder handling to use *the same* impl no matter where it's called from
refined the requestAuthenticationController to create its own widget instead of taking is as ctr arg since it only runs modal then dies asap

* added sync error and local activity widgets to toolbar

* small fix to ensure current checked action panel is still visible after viewing one of the "modal" panels

* added some new handling for "no account" placeholder.

the account wizard pops when you start without an account, or delete the last account. If you cancel out of the wizard with no accounts existing, now we have a placeholder view with action named "accounts" (so you can switch to other views in the gui as normal). The content is yet to be filled but the empty page shows correctly.

also spent a LOT of time getting the more button to look right. I switched to using the more icon (whch I still don't like but it's better than text for now) and wow it was a pain to get it to look right in the toolbar. Lots of comments about the fixes = mini style changes via style sheets. I'd say it's pretty good at this point.

a bit of cleanup too.

* fixed a bug on removing last account and added content to the accounts placeholder

* updated text related elements of account action/button

* Update owncloudgui.h

* small update to set a really temporary avatar icon

the avatar now "reverts" to the fake account icon after a modal operation, too

* inject AccountManager, add QPointers

inject the account manager instead of using the singleton instance() (future benefit)

make window and account manager qpointers and add nullchecks for posterity

* fixed focus chain on toolbar and added focus rect for mac

there is also only one toolbar now as the focus just didn't move from the accounts toolbar to the "main" toolbar even with every trick in the book.

* a bit of cleanup and renaming

* fixed windows build

apparently Utility::isMac() doesn't always work

* udpate tests

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

* added missing copyright/license info

yeah there were alot - apparently qt creator decided to stop adding the default license content to my new classes some time ago :(

---------

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>
Co-authored-by: Prajwol Amatya <prajwolamatya11@gmail.com>

…unavailable (#12561)

Update oauthpagecontroller.cpp

ci: update ocis docker image

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

The desktop client dropped support for the legacy server (ownCloud 10 /
Classic) in version 7.0 and now synchronizes with ownCloud Infinite
Scale (oCIS). Update the README introduction accordingly.

Supersedes the earlier blanket "ownCloud Server" -> "ownCloud Classic"
rename, which did not apply here: per maintainer review (and
changelog/6.0.0_2025-09-08/11742.md) classic support is being dropped,
so the client targets oCIS rather than Classic.

Part of the cross-repo rebrand tracked in owncloud/docs#5111.

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

This can be reverted once we have a new Qt version in place.

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

… updates (#12583)

Bumps the minor-and-patch group with 4 updates in the / directory: [actions/upload-artifact](https://github.com/actions/upload-artifact), [actions/setup-node](https://github.com/actions/setup-node), [actions/setup-python](https://github.com/actions/setup-python) and [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request).


Updates `actions/upload-artifact` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@bbbca2d...043fb46)

Updates `actions/setup-node` from 6.3.0 to 6.4.0
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@53b8394...48b55a0)

Updates `actions/setup-python` from 6.2.0 to 6.3.0
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@a309ff8...ece7cb0)

Updates `peter-evans/create-pull-request` from 8.1.0 to 8.1.1
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@c0f553f...5f6978f)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
- dependency-name: actions/setup-node
  dependency-version: 6.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: minor-and-patch
- dependency-name: actions/setup-python
  dependency-version: 6.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: minor-and-patch
- dependency-name: peter-evans/create-pull-request
  dependency-version: 8.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* first pass splitting accountView logic to controller

the basics are done here, and the account view still works in the new gui after the changes.

* remove uses of SettingsDialog

deleting the class to come

* missed one update

* revert fix for dc-312

get it from master once merged.

* moving raise behavior to main window

* eliminate some obsolete classes

these have been replaced with MainWindow, SettngsView and AboutView (all in subfolder mainwindow)

* various improvements

fixed missing folder wizard after create account with selective sync

refactored the manage account menu actions

renamed a few things

* moved accountmodalwidget to accountsgui

* blind refactor of the updater

with most changes in the updatedownloadedwidget which has been converted to QDialog

it basically was a QDialog but with the button signals/slots hand coded instead of just using the base dialog impl.

needs testing on platform that actually supports the updater impl

* possibly fixed windows updater

* maybe fixed linux updater

* fix windows?

* moving things around

also removed the very strange impls related to clicking the tray menu icon

* moving more things around

mostly to get non-tray related stuff out of owncloudgui, but also to "request" functionality that lives primarily in main window controller

* hide access to MainWindow from Application

the point is: if you can get MainWindow you can call all the public interfaces of MainWindow, which would include things like addViewAction and other stuff that should not be called "by just anyone". Replace the truly necessary public interface with wrappers in Application and only return QMainWindow * from Application::mainWindow()

* rename ownCloudGui to TrayMenuController

it does what it says on the tin!

* cleanup related to tray menu controller

also removed a bunch of dead includes here and ther

* nothing interesting here

just amended a comment and removed some whitespace

* fixing broken sync on load from config

overzealous cleanup of application removed key connection that queued folders loaded from config

squis tests should now pass

* fixing linux. again.

* removed dead mainwindow.h includes

also added object name to manage account menu

* test: update account menu selector

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>

---------

Signed-off-by: Prajwol Amatya <prajwolamatya11@gmail.com>
Co-authored-by: Prajwol Amatya <prajwolamatya11@gmail.com>

Co-authored-by: owncloud-settings-bot[bot] <291027677+owncloud-settings-bot[bot]@users.noreply.github.com>

CODEOWNERS file will take care of this

Co-authored-by: owncloud-translations-bot[bot] <274778013+owncloud-translations-bot[bot]@users.noreply.github.com>

Bumps [actions/cache](https://github.com/actions/cache) from 5.0.4 to 6.1.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@6682284...55cc834)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Erik Verbruggen <erik.verbruggen@kiteworks.com>

#12591)

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1.11.6 to 3.2.0.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Changelog](https://github.com/actions/create-github-app-token/blob/main/CHANGELOG.md)
- [Commits](actions/create-github-app-token@21cfef2...bcd2ba4)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Erik Verbruggen <erik.verbruggen@kiteworks.com>

Co-authored-by: owncloud-settings-bot[bot] <291027677+owncloud-settings-bot[bot]@users.noreply.github.com>

#12585)

* decent start

* a few improvements

mostly just skipping any attempt to pick a color, just use the say gray tones we use on other icons for the avatar

* fixed a bug in re-auth

related to demo only. For unknown reasons on reauth we get an empty auth url back from demo. this used to assert but since I finally hit it, I updated the handling to add an error message and let the user "stay logged out"

* update some comments

* begin killing deprecated functions

hit the ones with no code deps first

* remove versionSwitchOutput

just replace instance in code with aboutVersions which is essentially what the deprecated function did before

* update overrideServerUrl

un-deprecate overrideServerUrl and get rid of overrideServerUrlV2

* fix sneaky use of theme in qml

this should fix the squish tests

* remove showVirtualFilesOption

* remove enableSocketApiIconSupport

* remove aboutShowCopyright

we decided the (c) should never appear on the settings panel (it was next to the "about" button) so this function is thereby obsolete

Note, however, there was a strange side effect with the use of this in the gitSHA1 function: it effectively blocked turning the shortened sha into a url, and that url is important for oc "about" content.

No idea what the "logic" was there but it's gone now.

net == never any (c) on the settings page and sha can always be turned into a link if desired

* eliminate enableCernBranding

* kill QmlUrlButton

* killed dead qml

including the old AccountBar and AccountButton, plus all the properties in the theme that were qml related.

the only remaining qml is now related to the spaces browser in the folder wizard

* small refinements

renamed urlButtons to urlActions
undeprecated gitSHA1 and made it protected

* themed avatar colors are no more

Also adds a test for Linux to read the values from an actual file.