Skip to content

fix(network): avoid ANR by moving ConnectivityManager calls off the main thread on Android #2606

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
OrLeib wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(network): avoid ANR by moving ConnectivityManager calls off the main thread on Android #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion network/android/src/main/java/com/capacitorjs/plugins/network/Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public NetworkStatus getNetworkStatus() {
NetworkStatus networkStatus = new NetworkStatus();
if (this.connectivityManager != null) {
android.net.Network activeNetwork = this.connectivityManager.getActiveNetwork();
NetworkCapabilities capabilities = this.connectivityManager.getNetworkCapabilities(this.connectivityManager.getActiveNetwork());
NetworkCapabilities capabilities = this.connectivityManager.getNetworkCapabilities(activeNetwork);
if (activeNetwork != null && capabilities != null) {
networkStatus.connected =
capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) &&
Expand Down
44 changes: 26 additions & 18 deletions network/android/src/main/java/com/capacitorjs/plugins/network/NetworkPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,41 @@ public void getStatus(PluginCall call) {
}

/**
* Register the IntentReceiver on resume
* Register the network callback on resume.
* The ConnectivityManager calls are binder IPCs that can block for a long time, so they run
* on the plugin thread instead of the main thread to avoid ANRs. The plugin thread is a single
* serial thread, so this work stays ordered with handleOnPause and with plugin method calls.
*/
@Override
protected void handleOnResume() {
implementation.startMonitoring();
NetworkStatus afterPauseNetworkStatus = implementation.getNetworkStatus();
if (
prePauseNetworkStatus != null &&
!afterPauseNetworkStatus.connected &&
(prePauseNetworkStatus.connected || afterPauseNetworkStatus.connectionType != prePauseNetworkStatus.connectionType)
) {
Log.d(
"Capacitor/NetworkPlugin",
"Detected pre-pause and after-pause network status mismatch. Updating network status and notifying listeners."
);
this.updateNetworkStatus();
}
this.prePauseNetworkStatus = null;
getBridge().execute(() -> {
implementation.startMonitoring();
NetworkStatus afterPauseNetworkStatus = implementation.getNetworkStatus();
if (
prePauseNetworkStatus != null &&
!afterPauseNetworkStatus.connected &&
(prePauseNetworkStatus.connected || afterPauseNetworkStatus.connectionType != prePauseNetworkStatus.connectionType)
) {
Log.d(
"Capacitor/NetworkPlugin",
"Detected pre-pause and after-pause network status mismatch. Updating network status and notifying listeners."
);
this.updateNetworkStatus();
}
this.prePauseNetworkStatus = null;
});
}

/**
* Unregister the IntentReceiver on pause to avoid leaking it
* Unregister the network callback on pause to avoid leaking it.
* Runs on the plugin thread for the same reason as handleOnResume.
*/
@Override
protected void handleOnPause() {
this.prePauseNetworkStatus = implementation.getNetworkStatus();
implementation.stopMonitoring();
getBridge().execute(() -> {
this.prePauseNetworkStatus = implementation.getNetworkStatus();
implementation.stopMonitoring();
});
}

private void updateNetworkStatus() {
Expand Down