Skip to content

ConnectionValidator: Surface 401 instead of NPE #177

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
guruz merged 1 commit into from
May 31, 2026
+5 −2
Merged

ConnectionValidator: Surface 401 instead of NPE #177

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
7 changes: 5 additions & 2 deletions opencloudComLibrary/src/main/java/eu/opencloud/android/lib/common/ConnectionValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,11 @@ class ConnectionValidator(
*/
private fun checkUnauthorizedAccess(client: OpenCloudClient, singleSessionManager: SingleSessionManager, status: Int): Boolean {
var credentialsWereRefreshed = false
val account = client.account
val credentials = account.credentials
// During initial OAuth login the client has bearer credentials but no Android Account yet
// (the Account is persisted only after this call succeeds). Skip refresh — there's nothing
// to refresh against — otherwise we'd NPE on account.credentials / savedAccount below.
val account: OpenCloudAccount = client.account ?: return false
val credentials: OpenCloudCredentials = account.credentials ?: return false
if (shouldInvalidateAccountCredentials(credentials, account, status)) {
invalidateAccountCredentials(account, credentials)

Expand Down
Loading