Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9664ab31 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

utlis: Common: Switch to NetworkCapabilities to check for internet connection



- Current method has been deprecated

w: /builds/e/apps/apps/app/src/main/java/foundation/e/apps/utils/Common.kt: (47, 53): 'getter for activeNetworkInfo: NetworkInfo!' is deprecated. Deprecated in Java
w: /builds/e/apps/apps/app/src/main/java/foundation/e/apps/utils/Common.kt: (48, 63): 'getter for isConnected: Boolean' is deprecated. Deprecated in Java

Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent 5829ff58
Loading
Loading
Loading
Loading
Loading
+15 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context
import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager
import android.net.ConnectivityManager
import android.net.NetworkCapabilities
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.core.os.LocaleListCompat
@@ -42,10 +43,22 @@ object Common {

    val EXECUTOR = Executors.newCachedThreadPool()!!

    /*
     * Checks if device has internet connection available or not
     * @param context current Context
     * @return true if internet connection is available, false otherwise
     */
    fun isNetworkAvailable(context: Context): Boolean {
        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
        val activeNetworkInfo = connectivityManager.activeNetworkInfo
        return activeNetworkInfo != null && activeNetworkInfo.isConnected
        val capabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)

        if (capabilities != null) {
            if (capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                    && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
                return true
            }
        }
        return false
    }

    fun toMiB(bytes: Int): Double {