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

Commit fb50ba25 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'issue-123' into 'master' 

Fix Automatic install update when WiFi mode is on

See merge request e/apps/apps!15
parents ca9d6cd3 7e52b488

app/src/main/java/foundation/e/apps/updates/model/UpdatesWorker.kt

+6 −9
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context 
import android.content.pm.PackageManager

import android.net.ConnectivityManager

import android.net.NetworkCapabilities

import android.net.NetworkInfo

import android.os.AsyncTask

import android.preference.PreferenceManager

import android.util.Log
@@ -125,14 +126,10 @@ class UpdatesWorker(context: Context, params: WorkerParameters) : Worker(context 
            PackageManager.PERMISSION_GRANTED)



    private fun isConnectedToUnmeteredNetwork(context: Context): Boolean {

        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as

                ConnectivityManager

        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {

            val network = connectivityManager.activeNetwork

            val capabilities = connectivityManager.getNetworkCapabilities(network)

            capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)

        } else {

            Common.isNetworkAvailable(context)

        }

        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE)

        return if (connectivityManager is ConnectivityManager) {

            val networkInfo: NetworkInfo? = connectivityManager.activeNetworkInfo

            networkInfo?.isConnected ?: false

        } else false

    }

}