diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 693ded466f7ea65cccca3433ecaec319495fecca..da8cdb8b9e33a6827a206c19a7af35256195fe59 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,7 @@
+
diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java
index 903a74948f786f4d0b5539a3b7a91387829d70cb..07beb1a7f6166dd81b5280756dd3d6e948994a6f 100644
--- a/src/org/lineageos/updater/UpdatesCheckReceiver.java
+++ b/src/org/lineageos/updater/UpdatesCheckReceiver.java
@@ -24,10 +24,10 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.SystemClock;
-import android.preference.PreferenceManager;
import android.util.Log;
import androidx.core.app.NotificationCompat;
+import androidx.preference.PreferenceManager;
import org.json.JSONException;
import org.lineageos.updater.download.DownloadClient;
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index c4e9b8190ec1a4c229875fb707c433d06c181fd6..4ecf54f3cfc10d88f60a0017b5fcaafbb2e8912f 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -23,7 +23,6 @@ import android.content.res.Resources;
import android.net.Uri;
import android.os.BatteryManager;
import android.os.PowerManager;
-import android.preference.PreferenceManager;
import android.text.SpannableString;
import android.text.format.Formatter;
import android.text.method.LinkMovementMethod;
@@ -49,6 +48,7 @@ import androidx.appcompat.view.ContextThemeWrapper;
import androidx.appcompat.view.menu.MenuBuilder;
import androidx.appcompat.view.menu.MenuPopupHelper;
import androidx.appcompat.widget.PopupMenu;
+import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.snackbar.Snackbar;
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 0be1eab98bd4083fdca00e9a36fdf93230e2e3e5..e4823801edc360302556d17a5158ffdc5c9251de 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -31,17 +31,19 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
+import android.net.Network;
+import android.net.NetworkCapabilities;
import android.net.Uri;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.SystemProperties;
import android.os.SystemUpdateManager;
import android.os.storage.StorageManager;
-import android.preference.PreferenceManager;
import android.util.Log;
import android.widget.Toast;
+import androidx.preference.PreferenceManager;
+
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -254,15 +256,19 @@ public class Utils {
public static boolean isNetworkAvailable(Context context) {
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
- NetworkInfo info = cm.getActiveNetworkInfo();
- return !(info == null || !info.isConnected() || !info.isAvailable());
+ Network activeNetwork = cm.getActiveNetwork();
+ NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(activeNetwork);
+ return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+ || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
+ || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
}
public static boolean isOnWifiOrEthernet(Context context) {
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
- NetworkInfo info = cm.getActiveNetworkInfo();
- return (info != null && (info.getType() == ConnectivityManager.TYPE_ETHERNET
- || info.getType() == ConnectivityManager.TYPE_WIFI));
+ Network activeNetwork = cm.getActiveNetwork();
+ NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(activeNetwork);
+ return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+ || networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET);
}
/**