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/build.gradle b/packages/connectivity_plus/connectivity_plus/android/build.gradle
index 2ce55a5905..780bb2596b 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: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<String> getNetworkTypes() {
     }
   }
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   List<String> getCapabilitiesFromNetwork(Network network) {
     NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
     return getCapabilitiesList(capabilities);
   }
 
   @NonNull
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   List<String> getCapabilitiesList(NetworkCapabilities capabilities) {
     List<String> 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..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
@@ -14,6 +14,7 @@
 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 +77,11 @@ 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