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

Allow server URL to be pre-defined without enforcing it #2441

Merged
merged 1 commit into from Sep 23, 2020

Conversation

misch7
Copy link
Member

@misch7 misch7 commented Sep 17, 2020

Allow server URL to be pre-defined without enforcing it to be used unmodified

APPLICATION_SERVER_URL can be either empty or be specified. This commit adds the new CMake option APPLICATION_SERVER_URL_ENFORCE to decide whether to enforce the URL's unmodified use (like before, default: ON) or to allow modification by the user (new).

By default APPLICATION_SERVER_URL_ENFORCE is set to ON, to no break with the previous implementation's expectations.

If APPLICATION_SERVER_URL is empty, APPLICATION_SERVER_URL_ENFORCE will be ignored by the Account Wizard.

The previous behaviour confused me a bit with branded builds. When the URL was (usually) specified but not forced, it was simply discarded, forcing the user to manually supply it.

@misch7 misch7 added enhancement enhancement of a already implemented feature/code feature: ⚙️ settings Settings panel functionalities. labels Sep 17, 2020
NEXTCLOUD.cmake Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
@er-vin
Copy link
Member

er-vin commented Sep 23, 2020

/rebase

…modified

APPLICATION_SERVER_URL can be either empty or be specified. This commit adds the new CMake option APPLICATION_SERVER_URL_ENFORCE to decide whether to enforce the
URL's unmodified use (like before, default: ON) or to allow modification by the user (new).

By default APPLICATION_SERVER_URL_ENFORCE is set to ON, to no break with the previous implementation's expectations.

If APPLICATION_SERVER_URL is empty, APPLICATION_SERVER_URL_ENFORCE will be ignored by the Account Wizard.

The previous behaviour confused me a bit with branded builds. When the URL was (usually) specified but not forced, it was simply discarded, forcing the user to
manually supply it.

Signed-off-by: Michael Schuster <michael@schuster.ms>
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2441-ce71ffe9f9c78a84a2698c18ff16923ba4230f96-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@er-vin er-vin merged commit dde4dd7 into master Sep 23, 2020
@er-vin er-vin deleted the enh/server-url branch September 23, 2020 07:59
@misch7
Copy link
Member Author

misch7 commented Sep 23, 2020

/backport to stable-3.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement enhancement of a already implemented feature/code feature: ⚙️ settings Settings panel functionalities.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants