Repository navigation
Fix QR login - #17900
Merged
Merged
Fix QR login#17900
Conversation
Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>
|
|
||
| if (enforcedServersJson.isEmpty()) { | ||
| return false | ||
| return true |
Contributor
Author
There was a problem hiding this comment.
If enforced servers list is not defined, the default should be true (= any server is allowed).
This was already present before the kotlin refactoring:
private boolean checkAllowedServers(@NotNull String server) {
String webviewLogin = getString(R.string.webview_login_url);
if (!webviewLogin.isEmpty()) {
if (webviewLogin.startsWith(server)) {
return true;
}
}
String enforcedServerList = getString(R.string.enforce_servers);
if (!enforcedServerList.isEmpty()) {
ArrayList<EnforcedServer> enforcedServers = new Gson().fromJson(enforcedServerList,
new TypeToken<ArrayList<EnforcedServer>>() {
}
.getType());
for (EnforcedServer enforcedServer : enforcedServers) {
if (enforcedServer.getUrl().startsWith(server)) {
return true;
}
}
}
return false; // <-- HERE
}
alperozturk96
approved these changes
Oct 28, 2026
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
📱 QA build
The QA build installs alongside a released Nextcloud app, so you can keep Downloading the file requires a GitHub account, so open this link on the |
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
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.
Fix QR login when enforced servers are not defined
How to repro:
🏁 Checklist
/backport to stable-xx.x🤖 AI (if applicable)