merge new and old plugins

packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java

@@ -7,12 +7,13 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** ConnectivityPlugin */
-public class ConnectivityPlugin {
+public class ConnectivityPlugin implements FlutterPlugin {
 
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
@@ -41,4 +42,39 @@ public static void registerWith(Registrar registrar) {
     channel.setMethodCallHandler(methodChannelHandler);
     eventChannel.setStreamHandler(receiver);
   }
+
+  @Override
+  public void onAttachedToEngine(FlutterPluginBinding binding) {
+    final MethodChannel channel =
+        new MethodChannel(
+            binding.getFlutterEngine().getDartExecutor(), "plugins.flutter.io/connectivity");
+    final EventChannel eventChannel =
+        new EventChannel(
+            binding.getFlutterEngine().getDartExecutor(), "plugins.flutter.io/connectivity_status");
+    ConnectivityManager connectivityManager =
+        (ConnectivityManager)
+            binding
+                .getApplicationContext()
+                .getApplicationContext()
+                .getSystemService(Context.CONNECTIVITY_SERVICE);
+    WifiManager wifiManager =
+        (WifiManager)
+            binding
+                .getApplicationContext()
+                .getApplicationContext()
+                .getSystemService(Context.WIFI_SERVICE);
+
+    Connectivity connectivity = new Connectivity(connectivityManager, wifiManager);
+
+    ConnectivityMethodChannelHandler methodChannelHandler =
+        new ConnectivityMethodChannelHandler(connectivity);
+    ConnectivityBroadcastReceiver receiver =
+        new ConnectivityBroadcastReceiver(binding.getApplicationContext(), connectivity);
+
+    channel.setMethodCallHandler(methodChannelHandler);
+    eventChannel.setStreamHandler(receiver);
+  }
+
+  @Override
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {}
 }

packages/connectivity/example/android/app/src/main/java/dev/flutter/plugins/connectivity_exmaple/MainActivity.java

@@ -4,9 +4,9 @@
 
 package dev.flutter.plugins.connectivity_exmaple;
 
-import dev.flutter.plugins.connectivity.ConnectivityPlugin;
 import io.flutter.embedding.android.FlutterActivity;
 import io.flutter.embedding.engine.FlutterEngine;
+import io.flutter.plugins.connectivity.ConnectivityPlugin;
 
 public class MainActivity extends FlutterActivity {