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

Commit 3a407d47 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

rewrite commonUtils.haveNetworkConnexion()

parent b798c44d
Loading
Loading
Loading
Loading
Loading
+13 −12
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import android.content.Context;
import android.media.MediaScannerConnection;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.Uri;
import android.util.Log;
@@ -192,21 +193,21 @@ public abstract class CommonUtils {
     */
    public static boolean haveNetworkConnexion(Context context) {
        Log.i(TAG, "haveNetworkConnexion()");
        boolean haveConnectedWifi = false;
        boolean haveConnectedMobile = false;

        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
        Network[] networks = cm.getAllNetworks();
        for (Network network : networks) {
            NetworkInfo networkInfo = cm.getNetworkInfo(network);
            if (networkInfo.getType()== ConnectivityManager.TYPE_WIFI)
                haveConnectedWifi |= networkInfo.isConnected();
            if (networkInfo.getType()== ConnectivityManager.TYPE_MOBILE)
                haveConnectedMobile |= networkInfo.isConnected();

        ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
        NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());

        if (capabilities != null
                && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
                && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {
            return true;
        }
        return haveConnectedWifi || haveConnectedMobile;
        return false;
    }



    /**
     * Get mimetype of file from the file itself
     *