Revert "Adding getWifiName to connectivity plugin (flutter#685)"

This reverts commit b5dbd8d.

Author: andreidiaconu

packages/connectivity/CHANGELOG.md

@@ -1,7 +1,3 @@
-## 0.3.2
-
-* Adding getWifiName() to obtain current wifi network's SSID.
-
 ## 0.3.1
 
 * Updated Gradle tooling to match Android Studio 3.1.2.

packages/connectivity/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="io.flutter.plugins.connectivity">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 </manifest>

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

@@ -10,8 +10,6 @@
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import io.flutter.plugin.common.EventChannel;
 import io.flutter.plugin.common.EventChannel.EventSink;
 import io.flutter.plugin.common.EventChannel.StreamHandler;
@@ -74,43 +72,18 @@ private static String getNetworkType(int type) {
 
   @Override
   public void onMethodCall(MethodCall call, Result result) {
-    switch (call.method) {
-      case "check":
-        handleCheck(call, result);
-        break;
-      case "wifiName":
-        handleWifiName(call, result);
-        break;
-      default:
-        result.notImplemented();
-        break;
-    }
-  }
-
-  private void handleCheck(MethodCall call, final Result result) {
-    NetworkInfo info = manager.getActiveNetworkInfo();
-    if (info != null && info.isConnected()) {
-      result.success(getNetworkType(info.getType()));
+    if (call.method.equals("check")) {
+      NetworkInfo info = manager.getActiveNetworkInfo();
+      if (info != null && info.isConnected()) {
+        result.success(getNetworkType(info.getType()));
+      } else {
+        result.success("none");
+      }
     } else {
-      result.success("none");
+      result.notImplemented();
     }
   }
 
-  private void handleWifiName(MethodCall call, final Result result) {
-    WifiManager wifiManager =
-        (WifiManager) registrar.context().getSystemService(Context.WIFI_SERVICE);
-
-    WifiInfo wifiInfo = null;
-    if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo();
-
-    String ssid = null;
-    if (wifiInfo != null) ssid = wifiInfo.getSSID();
-
-    if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID"
-
-    result.success(ssid);
-  }
-
   private BroadcastReceiver createReceiver(final EventSink events) {
     return new BroadcastReceiver() {
       @Override

packages/connectivity/ios/Classes/ConnectivityPlugin.m

@@ -6,8 +6,6 @@
 
 #import "Reachability/Reachability.h"
 
-#import "SystemConfiguration/CaptiveNetwork.h"
-
 @interface FLTConnectivityPlugin ()<FlutterStreamHandler>
 @end
 
@@ -29,20 +27,6 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   [streamChannel setStreamHandler:instance];
 }
 
-- (NSString*)getWifiName {
-  NSString* wifiName = nil;
-  NSArray* interFaceNames = (__bridge_transfer id)CNCopySupportedInterfaces();
-
-  for (NSString* name in interFaceNames) {
-    NSDictionary* info = (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)name);
-    if (info[@"SSID"]) {
-      wifiName = info[@"SSID"];
-    }
-  }
-
-  return wifiName;
-}
-
 - (NSString*)statusFromReachability:(Reachability*)reachability {
   NetworkStatus status = [reachability currentReachabilityStatus];
   switch (status) {
@@ -63,8 +47,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     // and the code
     // gets more involved. So for now, this will do.
     result([self statusFromReachability:[Reachability reachabilityForInternetConnection]]);
-  } else if ([call.method isEqualToString:@"wifiName"]) {
-    result([self getWifiName]);
   } else {
     result(FlutterMethodNotImplemented);
   }

packages/connectivity/lib/connectivity.dart

@@ -42,20 +42,6 @@ class Connectivity {
     final String result = await _methodChannel.invokeMethod('check');
     return _parseConnectivityResult(result);
   }
-
-  /// Obtains the wifi name (SSID) of the connected network
-  ///
-  /// Please note that it DOESN'T WORK on emulators (returns null).
-  ///
-  /// From android 8.0 onwards the GPS must be ON (high accuracy)
-  /// in order to be able to obtain the SSID.
-  Future<String> getWifiName() async {
-    String wifiName = await _methodChannel.invokeMethod('wifiName');
-    // as Android might return <unknown ssid>, uniforming result
-    // our iOS implementation will return null
-    if (wifiName == '<unknown ssid>') wifiName = null;
-    return wifiName;
-  }
 }
 
 ConnectivityResult _parseConnectivityResult(String state) {

packages/connectivity/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <[email protected]>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.3.2
+version: 0.3.1
 
 flutter:
   plugin: