Skip to content

feat(connectivity): improve network callback unregistration handling #3681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(connectivity): improve network callback unregistration handling #3681

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c66b2b0
feat(connectivity): improve network callback unregistration handling
KirillBorodin Sep 16, 2025
bea2447
feat(connectivity): fixed imports formatting
KirillBorodin Sep 16, 2025
6db894a
feat(connectivity): removed empty space in import
KirillBorodin Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions ...d/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import androidx.annotation.RequiresApi;
import io.flutter.plugin.common.EventChannel;
import java.util.List;

Expand Down Expand Up @@ -86,19 +87,33 @@ public void onLost(Network network) {
@Override
public void onCancel(Object arguments) {
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (networkCallback != null) {
connectivity.getConnectivityManager().unregisterNetworkCallback(networkCallback);
networkCallback = null;
}
safelyUnregisterNetworkCallback();
} else {
safelyUnregisterReceiver();
}
}

@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
void safelyUnregisterNetworkCallback() {
if (networkCallback != null) {
try {
context.unregisterReceiver(this);
connectivity.getConnectivityManager().unregisterNetworkCallback(networkCallback);
} catch (Exception e) {
// listen never called, ignore the error
// ignore the error
} finally {
networkCallback = null;
}
}
}

void safelyUnregisterReceiver() {
try {
context.unregisterReceiver(this);
} catch (Exception e) {
// listen never called, ignore the error
}
}

@Override
public void onReceive(Context context, Intent intent) {
if (events != null) {
Expand Down
Loading