From ce02c5a1426b18a527de7ba2d9a8a094f583ab87 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 25 Oct 2022 10:47:07 +0530 Subject: [PATCH 1/3] Updater: add missing SCHEDULE_EXACT_ALARM permission --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 693ded46..da8cdb8b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -9,6 +9,7 @@ + -- GitLab From 84cce80145b6fd4079e48b94f009f5fbaccb42bd Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 25 Oct 2022 10:56:22 +0530 Subject: [PATCH 2/3] Updater: Use androidx for PreferenceManager --- src/org/lineageos/updater/UpdatesCheckReceiver.java | 2 +- src/org/lineageos/updater/UpdatesListAdapter.java | 2 +- src/org/lineageos/updater/misc/Utils.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java index 903a7494..07beb1a7 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 c4e9b819..4ecf54f3 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 0be1eab9..9637be48 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -38,10 +38,11 @@ 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; -- GitLab From edab38509bf12f9f84f7b15cba9568c726cf16f5 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 25 Oct 2022 11:15:06 +0530 Subject: [PATCH 3/3] Updater: Update network utils for newer android --- src/org/lineageos/updater/misc/Utils.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index 9637be48..e4823801 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -31,7 +31,8 @@ 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; @@ -255,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); } /** -- GitLab