From fc94b90a031198eecde77d03ccda82b5b6c272a2 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 15 Jun 2023 12:57:35 -0400 Subject: [PATCH] Revert "Adopt new APIs for network connectivity check." This reverts commit de4c6ab7b7d3fb153a2e1f42062ea5316506ee94. --- .../jobmanager/impl/NetworkConstraint.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java index f3f4300fc3..5851a1af04 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java @@ -4,10 +4,7 @@ import android.app.Application; import android.app.job.JobInfo; import android.content.Context; import android.net.ConnectivityManager; -import android.net.Network; -import android.net.NetworkCapabilities; import android.net.NetworkInfo; -import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -48,15 +45,9 @@ public class NetworkConstraint implements Constraint { public static boolean isMet(@NonNull Context context) { ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo(); - if (Build.VERSION.SDK_INT >= 23) { - Network activeNetwork = connectivityManager.getActiveNetwork(); - NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork); - return networkCapabilities != null && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); - } else { - NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo(); - return activeNetworkInfo != null && activeNetworkInfo.isConnected(); - } + return activeNetworkInfo != null && activeNetworkInfo.isConnected(); } public static final class Factory implements Constraint.Factory {