From fe9c4dd168d2ce94686718960f36d1d2cf013797 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Thu, 19 Mar 2026 19:45:30 +0200 Subject: [PATCH 1/6] fix(connectivity_plus): Register broadcast receiver with correct flag, bump minSDK to 21 --- .../connectivity_plus/android/build.gradle | 6 +++++- .../connectivity_plus/android/gradle.properties | 2 ++ .../fluttercommunity/plus/connectivity/Connectivity.java | 3 --- .../plus/connectivity/ConnectivityBroadcastReceiver.java | 6 +++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/connectivity_plus/connectivity_plus/android/build.gradle b/packages/connectivity_plus/connectivity_plus/android/build.gradle index 2ce55a5905..4695f2fe32 100644 --- a/packages/connectivity_plus/connectivity_plus/android/build.gradle +++ b/packages/connectivity_plus/connectivity_plus/android/build.gradle @@ -31,10 +31,14 @@ android { } defaultConfig { - minSdk 19 + minSdk 21 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { disable 'InvalidPackage' } + + dependencies { + implementation "androidx.core:core-ktx:1.18.0" + } } diff --git a/packages/connectivity_plus/connectivity_plus/android/gradle.properties b/packages/connectivity_plus/connectivity_plus/android/gradle.properties index 8bd86f6805..6003299741 100644 --- a/packages/connectivity_plus/connectivity_plus/android/gradle.properties +++ b/packages/connectivity_plus/connectivity_plus/android/gradle.properties @@ -1 +1,3 @@ +#Thu Mar 19 19:36:21 EET 2026 +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java index d5e5cbbde2..4c05eb4b4f 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java @@ -9,7 +9,6 @@ import android.net.NetworkCapabilities; import android.os.Build; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; import java.util.ArrayList; import java.util.List; @@ -39,14 +38,12 @@ List getNetworkTypes() { } } - @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) List getCapabilitiesFromNetwork(Network network) { NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network); return getCapabilitiesList(capabilities); } @NonNull - @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) List getCapabilitiesList(NetworkCapabilities capabilities) { List types = new ArrayList<>(); if (capabilities == null diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java index 324d3d234d..27fc5ce074 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -14,7 +14,11 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; + +import androidx.core.content.ContextCompat; + import io.flutter.plugin.common.EventChannel; + import java.util.List; /** @@ -76,7 +80,7 @@ public void onLost(Network network) { }; connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback); } else { - context.registerReceiver(this, new IntentFilter(CONNECTIVITY_ACTION)); + ContextCompat.registerReceiver(context, this, new IntentFilter(CONNECTIVITY_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED); } // Need to emit first event with connectivity types without waiting for first change in system // that might happen much later From c8ca0771e52b72805ba7e69fc90e06ab9af67721 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Thu, 19 Mar 2026 20:16:42 +0200 Subject: [PATCH 2/6] fix(connectivity_plus): Switch to Java based androidx.core --- .../connectivity_plus/connectivity_plus/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/connectivity_plus/connectivity_plus/android/build.gradle b/packages/connectivity_plus/connectivity_plus/android/build.gradle index 4695f2fe32..780bb2596b 100644 --- a/packages/connectivity_plus/connectivity_plus/android/build.gradle +++ b/packages/connectivity_plus/connectivity_plus/android/build.gradle @@ -39,6 +39,6 @@ android { } dependencies { - implementation "androidx.core:core-ktx:1.18.0" + implementation "androidx.core:core:1.18.0" } } From 40a5242d39cd6e11d8989400c605830b9ffef8bd Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Thu, 19 Mar 2026 21:37:15 +0200 Subject: [PATCH 3/6] fix formatting --- .../plus/connectivity/ConnectivityBroadcastReceiver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java index 27fc5ce074..a135e0ee59 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -80,7 +80,11 @@ public void onLost(Network network) { }; connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback); } else { - ContextCompat.registerReceiver(context, this, new IntentFilter(CONNECTIVITY_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED); + ContextCompat.registerReceiver( + context, + this, + new IntentFilter(CONNECTIVITY_ACTION), + ContextCompat.RECEIVER_NOT_EXPORTED); } // Need to emit first event with connectivity types without waiting for first change in system // that might happen much later From 3da817eef64275a2e39ebff66e0f8e4548aa8149 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Thu, 19 Mar 2026 22:24:42 +0200 Subject: [PATCH 4/6] Update formatting --- .../plus/connectivity/ConnectivityBroadcastReceiver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java index a135e0ee59..4e6bb994ba 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -81,10 +81,10 @@ public void onLost(Network network) { connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback); } else { ContextCompat.registerReceiver( - context, - this, - new IntentFilter(CONNECTIVITY_ACTION), - ContextCompat.RECEIVER_NOT_EXPORTED); + context, + this, + new IntentFilter(CONNECTIVITY_ACTION), + ContextCompat.RECEIVER_NOT_EXPORTED); } // Need to emit first event with connectivity types without waiting for first change in system // that might happen much later From 06ff59056c7aaceea865bd0d532c44fe9dd33b5b Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Thu, 19 Mar 2026 23:15:35 +0200 Subject: [PATCH 5/6] fix formatting --- .editorconfig | 7 +++++++ .../plus/connectivity/ConnectivityBroadcastReceiver.java | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 2d682b32e4..d11780ee18 100644 --- a/.editorconfig +++ b/.editorconfig @@ -29,6 +29,13 @@ indent_size = 2 indent_size = 4 max_line_length = 100 +[*.java] +indent_style = space +indent_size = 2 +tab_width = 2 +max_line_length = 100 +insert_final_newline = false + [*.m] indent_style = space indent_size = 2 diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java index 4e6bb994ba..8b306a82f4 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -14,11 +14,8 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; - import androidx.core.content.ContextCompat; - import io.flutter.plugin.common.EventChannel; - import java.util.List; /** From 18634106b0c290004b16a39d92832222c9364f61 Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Thu, 19 Mar 2026 23:21:31 +0200 Subject: [PATCH 6/6] fix formatting --- .../plus/connectivity/ConnectivityBroadcastReceiver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java index 8b306a82f4..ba4ee0a9ad 100644 --- a/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -78,10 +78,10 @@ public void onLost(Network network) { connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback); } else { ContextCompat.registerReceiver( - context, - this, - new IntentFilter(CONNECTIVITY_ACTION), - ContextCompat.RECEIVER_NOT_EXPORTED); + context, + this, + new IntentFilter(CONNECTIVITY_ACTION), + ContextCompat.RECEIVER_NOT_EXPORTED); } // Need to emit first event with connectivity types without waiting for first change in system // that might happen much later