[fenix] For https://github.com/mozilla-mobile/fenix/issues/7048: Network info migration (https://github.com/mozilla-mobile/fenix/pull/7091)
* Fixes https://github.com/mozilla-mobile/fenix/issues/7048. Adds extension function to check if online or not based on capabilities Modified `buildDeviceList` Modifies tests * Fixing lint error for max length Fixing test in AppRequestInterceptorTest.kt * Adds suppression for deprecation Moving away from using anko for ConnectivityManager instance * Creates ConnectivityManager extension component * Fixes https://github.com/mozilla-mobile/fenix/issues/7180 Refactors test cases to fix static mockspull/600/head
parent
4fada3f5be
commit
c634d89cd4
@ -0,0 +1,29 @@
|
|||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
package org.mozilla.fenix.ext
|
||||||
|
|
||||||
|
import android.net.ConnectivityManager
|
||||||
|
import android.net.Network
|
||||||
|
import android.net.NetworkCapabilities
|
||||||
|
import android.os.Build
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks for availability of network.
|
||||||
|
*
|
||||||
|
* For devices above [Build.VERSION_CODES.M] it even checks if there's internet flowing through it or not.
|
||||||
|
* */
|
||||||
|
fun ConnectivityManager.isOnline(network: Network? = null): Boolean {
|
||||||
|
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||||
|
getNetworkCapabilities(network ?: activeNetwork)?.let {
|
||||||
|
it.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
|
||||||
|
it.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
|
||||||
|
} ?: false
|
||||||
|
} else {
|
||||||
|
// for devices below android M, there's no better way to get this.
|
||||||
|
// active network info can be null if there are no active networks.
|
||||||
|
@Suppress("Deprecation")
|
||||||
|
activeNetworkInfo?.isConnected ?: false
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue