Commit 7afc0aa 1 parent ff58734 commit 7afc0aa Copy full SHA for 7afc0aa
File tree 1 file changed +11
-3
lines changed
common/src/main/java/com/microsoft/identity/common/adal/internal/net
1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change 25
25
import android .annotation .TargetApi ;
26
26
import android .content .Context ;
27
27
import android .net .ConnectivityManager ;
28
+ import android .net .Network ;
29
+ import android .net .NetworkCapabilities ;
28
30
import android .net .NetworkInfo ;
29
31
import android .os .Build ;
30
32
@@ -62,9 +64,15 @@ public DefaultConnectionService(Context ctx) {
62
64
public boolean isConnectionAvailable () {
63
65
ConnectivityManager connectivityManager = (ConnectivityManager ) mConnectionContext
64
66
.getSystemService (Context .CONNECTIVITY_SERVICE );
65
- NetworkInfo activeNetwork = connectivityManager .getActiveNetworkInfo ();
66
- @ SuppressWarnings ("deprecation" )
67
- final boolean isConnectionAvailable = activeNetwork != null && activeNetwork .isConnectedOrConnecting ();
67
+ final boolean isConnectionAvailable ;
68
+ if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .M ) {
69
+ final Network activeNetwork = connectivityManager .getActiveNetwork ();
70
+ final NetworkCapabilities capabilities = connectivityManager .getNetworkCapabilities (activeNetwork );
71
+ isConnectionAvailable = capabilities .hasCapability (NetworkCapabilities .NET_CAPABILITY_VALIDATED );
72
+ } else {
73
+ final NetworkInfo activeNetwork = connectivityManager .getActiveNetworkInfo ();
74
+ isConnectionAvailable = activeNetwork != null && activeNetwork .isConnected ();
75
+ }
68
76
Telemetry .emit ((BaseEvent ) new BaseEvent ().put (TelemetryEventStrings .Key .NETWORK_CONNECTION , String .valueOf (isConnectionAvailable )));
69
77
return isConnectionAvailable ;
70
78
}
You can’t perform that action at this time.
0 commit comments