Repository navigation
improve sync error handling #3396
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
Open
alperozturk96
wants to merge
7
commits into
main
Choose a base branch
from
feat/improve-error-feedback
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+380
−169
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
81e1bc1
expose 423 locked error
alperozturk96 3639ea3
expose other errors
alperozturk96 bf1aa07
refactor server sync task
alperozturk96 f780145
fix the recreate remoteId bug
alperozturk96 b30f595
better message for HTTP_FORBIDDEN 403
alperozturk96 4bbfc94
add token mismatch
alperozturk96 6b0ae68
improve sync active state
alperozturk96 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
38 changes: 38 additions & 0 deletions
38
app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Nextcloud - Android Client | ||
| * | ||
| * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com> | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| package it.niedermann.owncloud.notes.main | ||
|
|
||
| import androidx.annotation.StringRes | ||
| import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException | ||
| import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException | ||
| import com.nextcloud.android.sso.exceptions.NextcloudNetworkException | ||
| import com.nextcloud.android.sso.exceptions.TokenMismatchException | ||
| import it.niedermann.owncloud.notes.persistence.NoteSyncException | ||
| import it.niedermann.owncloud.notes.persistence.SyncFailureReason | ||
|
|
||
| object SyncErrorMessage { | ||
| @JvmStatic | ||
| @StringRes | ||
| fun of(exceptions: Collection<Throwable>): Int = | ||
| (exceptions.map { it.syncFailureReason() }.distinct().singleOrNull() ?: SyncFailureReason.UNKNOWN).message | ||
|
alperozturk96 marked this conversation as resolved.
|
||
|
|
||
| @JvmStatic | ||
| @StringRes | ||
| fun of(exception: Throwable): Int = exception.syncFailureReason().message | ||
|
|
||
| private fun Throwable.syncFailureReason(): SyncFailureReason = | ||
| generateSequence(this) { it.cause }.firstNotNullOfOrNull { it.directSyncFailureReason() } | ||
| ?: SyncFailureReason.UNKNOWN | ||
|
|
||
| private fun Throwable.directSyncFailureReason(): SyncFailureReason? = when (this) { | ||
| is NoteSyncException -> reason | ||
| is NextcloudHttpRequestFailedException -> SyncFailureReason.fromStatusCode(statusCode) | ||
| is NextcloudNetworkException, is NextcloudApiNotRespondingException -> SyncFailureReason.SERVER_UNREACHABLE | ||
| is TokenMismatchException -> SyncFailureReason.TOKEN_MISMATCH | ||
| else -> null | ||
| } | ||
| } | ||
14 changes: 14 additions & 0 deletions
14
app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSyncException.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * Nextcloud - Android Client | ||
| * | ||
| * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com> | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| package it.niedermann.owncloud.notes.persistence | ||
|
|
||
| import retrofit2.Response | ||
|
|
||
| class NoteSyncException(noteTitle: String, response: Response<*>) : | ||
| Exception("Could not sync \"$noteTitle\" (HTTP ${response.code()}): ${response.message()}") { | ||
| val reason = SyncFailureReason.fromStatusCode(response.code()) | ||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.