-
Notifications
You must be signed in to change notification settings - Fork 34
add: network connectivity error #887
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
Merged
Merged
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions
20
lib/src/main/java/com/nextcloud/android/sso/exceptions/NextcloudNetworkException.java
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,20 @@ | ||
| /* | ||
| * Nextcloud Android SingleSignOn Library | ||
| * | ||
| * SPDX-FileCopyrightText: 2018-2025 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| */ | ||
| package com.nextcloud.android.sso.exceptions; | ||
|
|
||
| import androidx.annotation.Nullable; | ||
| import com.nextcloud.android.sso.R; | ||
|
|
||
| public class NextcloudNetworkException extends SSOException { | ||
| public NextcloudNetworkException(@Nullable Throwable cause) { | ||
| super("Network connection failed. Please check your internet connection and server URL.", | ||
| R.string.network_error_title, | ||
| R.string.retry_action, | ||
| null, | ||
| cause); | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -95,13 +95,39 @@ public static SSOException parseNextcloudCustomException(@NonNull Context contex | |
| case Constants.EXCEPTION_INVALID_REQUEST_URL -> | ||
| new NextcloudInvalidRequestUrlException(context, exception.getCause()); | ||
| case Constants.EXCEPTION_HTTP_REQUEST_FAILED -> { | ||
| final int statusCode = Integer.parseInt(exception.getCause().getMessage()); | ||
| final var cause = exception.getCause().getCause(); | ||
| yield new NextcloudHttpRequestFailedException(context, statusCode, cause); | ||
| Throwable rootCause = exception.getCause(); | ||
| if (rootCause != null && rootCause.getMessage() != null) { | ||
| int statusCode = Integer.parseInt(rootCause.getMessage()); | ||
| Throwable cause = (rootCause.getCause() != null) ? rootCause.getCause() : null; | ||
| yield new NextcloudHttpRequestFailedException(context, statusCode, cause); | ||
| } else { | ||
| yield new UnknownErrorException(message); | ||
| } | ||
| } | ||
| case Constants.EXCEPTION_ACCOUNT_ACCESS_DECLINED -> | ||
| new NextcloudFilesAppAccountPermissionNotGrantedException(context); | ||
| default -> new UnknownErrorException(exception.getMessage()); | ||
| default -> { | ||
| if (isNetworkConnectivityError(exception)) { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Check exception and throw NextcloudNetworkException |
||
| yield new NextcloudNetworkException(exception); | ||
| } else { | ||
| yield new UnknownErrorException(exception.getMessage()); | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private static boolean isNetworkConnectivityError(Exception exception) { | ||
| Throwable current = exception; | ||
| while (current != null) { | ||
| if (current instanceof java.net.UnknownHostException || | ||
| current instanceof javax.net.ssl.SSLException || | ||
| current instanceof java.net.SocketException || | ||
| current instanceof java.io.InterruptedIOException || | ||
| current instanceof java.net.HttpRetryException) { | ||
| return true; | ||
| } | ||
| current = current.getCause(); | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check NPE.