Skip to content

fix(connectivity_plus): Fix connectivity state update on Android when network is lost #2673

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

Merged
merged 6 commits into from
Mar 11, 2024
Merged

fix(connectivity_plus): Fix connectivity state update on Android when network is lost #2673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6566b87
fix(connectivity_plus): Fix connectivity state update on losing netwo…
vbuberen Mar 11, 2024
a260395
Revert change in platform interface
vbuberen Mar 11, 2024
7586cbf
Remove debug log
vbuberen Mar 11, 2024
7d21d11
Fix formatting and add Java code style to rules
vbuberen Mar 11, 2024
e3dd38c
One more fix for formatting
vbuberen Mar 11, 2024
3b88ab3
Remove added editorconfig and revert changes
vbuberen Mar 11, 2024
File filter

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 ...ages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
Copy link
Collaborator Author

@vbuberen vbuberen Mar 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to do it because of using 8.3.0 Gradle plugin, which didn't allow me to open just Android part of the plugin with 7.6.1 version of Gradle wrapper.
Copy link
Collaborator Author

@vbuberen vbuberen Mar 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will open another PR where I will address such changes.
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
21 changes: 13 additions & 8 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 @@ -10,6 +10,7 @@
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
Expand Down Expand Up @@ -48,9 +49,15 @@ public void onAvailable(Network network) {
sendEvent();
}

@Override
public void onCapabilitiesChanged(
Network network, NetworkCapabilities networkCapabilities) {
sendEvent();
}

@Override
public void onLost(Network network) {
sendEvent(Connectivity.CONNECTIVITY_NONE);
sendEvent();
}
};
connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback);
Expand All @@ -70,7 +77,7 @@ public void onCancel(Object arguments) {
try {
context.unregisterReceiver(this);
} catch (Exception e) {
//listen never called, ignore the error
// listen never called, ignore the error
}
}
}
Expand All @@ -84,11 +91,9 @@ public void onReceive(Context context, Intent intent) {

private void sendEvent() {
Runnable runnable = () -> events.success(connectivity.getNetworkTypes());
mainHandler.post(runnable);
}

private void sendEvent(final String networkType) {
Runnable runnable = () -> events.success(networkType);
mainHandler.post(runnable);
// The dalay is needed because callback methods suffer from race conditions.
// More info:
// https://developer.android.com/develop/connectivity/network-ops/reading-network-state#listening-events
mainHandler.postDelayed(runnable, 100);
}
}
3 changes: 1 addition & 2 deletions ...nnectivity_plus/connectivity_plus_platform_interface/lib/method_channel_connectivity.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ class MethodChannelConnectivity extends ConnectivityPlatform {
Stream<List<ConnectivityResult>> get onConnectivityChanged {
_onConnectivityChanged ??= eventChannel
.receiveBroadcastStream()
.map((dynamic result) =>
result is String ? [result] : List<String>.from(result))
.map((dynamic result) => List<String>.from(result))
.map(parseConnectivityResults);
return _onConnectivityChanged!;
}
Expand Down