Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 18:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix permission crash with new networking check on API<23.

Browse Source
This commit is contained in:
Cody Henthorne
2022-02-02 19:40:22 -05:00
parent 7d7db1b60a
commit 92978b0e3f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
View File

@@ -67,7 +67,7 @@ public class NetworkConstraintObserver implements ConstraintObserver {
}
private void requestNetwork(int retryCount) {
if (Build.VERSION.SDK_INT < 21 || retryCount > 5) {
if (Build.VERSION.SDK_INT < 24 || retryCount > 5) {
hasInternet = isActiveNetworkConnected(application);
application.registerReceiver(new BroadcastReceiver() {
@@ -86,7 +86,7 @@ public class NetworkConstraintObserver implements ConstraintObserver {
.build();
ConnectivityManager connectivityManager = Objects.requireNonNull(ContextCompat.getSystemService(application, ConnectivityManager.class));
connectivityManager.requestNetwork(request, Build.VERSION.SDK_INT >= 26 ? new NetworkStateListener26(retryCount) : new NetworkStateListener21());
connectivityManager.requestNetwork(request, Build.VERSION.SDK_INT >= 26 ? new NetworkStateListener26(retryCount) : new NetworkStateListener24());
}
}
@@ -117,8 +117,8 @@ public class NetworkConstraintObserver implements ConstraintObserver {
}
}
@TargetApi(21)
private class NetworkStateListener21 extends ConnectivityManager.NetworkCallback {
@TargetApi(24)
private class NetworkStateListener24 extends ConnectivityManager.NetworkCallback {
@Override
public void onAvailable(@NonNull Network network) {
Log.i(REASON, "Network available: " + network.hashCode());
@@ -136,7 +136,7 @@ public class NetworkConstraintObserver implements ConstraintObserver {
}
@TargetApi(26)
private class NetworkStateListener26 extends NetworkStateListener21 {
private class NetworkStateListener26 extends NetworkStateListener24 {
private final int retryCount;
public NetworkStateListener26(int retryCount) {