Skip to content
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

Add version-specific functionality for connections. #1000

Closed
wants to merge 3 commits into from
Closed

Add version-specific functionality for connections. #1000

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55b026f
Add version-specific functionality for connections.
AdamBJohnsonx Aug 14, 2020
064819c
Add changelog entry, update method call.
AdamBJohnsonx Nov 18, 2020
a64f3d6
Add back deprecation suppression.
AdamBJohnsonx Nov 18, 2020
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
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ vNext
----------
- Expose IAccountCredentialCache for accessing lower-level cache functions.
- Adds unit test to verify .trim() behavior of cache keys.
- Avoid deprecated network APIs on later version of Android (#1000)

Version 3.0.7
----------
Expand Down
14 changes: 11 additions & 3 deletions ...c/main/java/com/microsoft/identity/common/adal/internal/net/DefaultConnectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import android.annotation.TargetApi;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.os.Build;

Expand Down Expand Up @@ -62,9 +64,15 @@ public DefaultConnectionService(Context ctx) {
public boolean isConnectionAvailable() {
ConnectivityManager connectivityManager = (ConnectivityManager) mConnectionContext
.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
@SuppressWarnings("deprecation")
final boolean isConnectionAvailable = activeNetwork != null && activeNetwork.isConnectedOrConnecting();
final boolean isConnectionAvailable;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
final Network activeNetwork = connectivityManager.getActiveNetwork();
final NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(activeNetwork);
isConnectionAvailable = capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
} else {
final NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
isConnectionAvailable = activeNetwork != null && activeNetwork.isConnectedOrConnecting();
}
Telemetry.emit((BaseEvent) new BaseEvent().put(TelemetryEventStrings.Key.NETWORK_CONNECTION, String.valueOf(isConnectionAvailable)));
return isConnectionAvailable;
}
Expand Down