Skip to content

Fix QR login #17900

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

Merged
alperozturk96 merged 1 commit into from
Oct 29, 2026
+1 −1
Merged

Fix QR login #17900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/authentication/server/EnforcedServerPolicy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object EnforcedServerPolicy {
}

if (enforcedServersJson.isEmpty()) {
return false
return true

@daniele-verducci daniele-verducci Oct 28, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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
    }

}

return parse(enforcedServersJson).any { it.url.startsWith(server) }
Expand Down
Loading