Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[Connectivity] wifi removal #3173

Merged
cyanglaz merged 7 commits into from
Oct 23, 2020
Merged

[Connectivity] wifi removal #3173

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ce903a
dart+ios
Oct 20, 2020
7b6f662
android
Oct 20, 2020
bd3794d
update CHANGELOG
Oct 20, 2020
a0a7b49
merge master
Oct 22, 2020
65379b4
remove unused imports
Oct 22, 2020
5b0a3af
Update packages/connectivity/connectivity/CHANGELOG.md
Oct 22, 2020
25754fa
Merge branch 'master' into connectivity_wifi_removal
Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
android
  • Loading branch information
Chris Yang committed Oct 20, 2020
commit 7b6f66233d590752b9f7f09aaba4bff42707a06a
1 change: 0 additions & 1 deletion packages/connectivity/connectivity/android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
44 changes: 1 addition & 43 deletions ...vity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;

/** Reports connectivity related information such as connectivity type and wifi information. */
class Connectivity {
private ConnectivityManager connectivityManager;
private WifiManager wifiManager;

Connectivity(ConnectivityManager connectivityManager, WifiManager wifiManager) {
Connectivity(ConnectivityManager connectivityManager) {
this.connectivityManager = connectivityManager;
this.wifiManager = wifiManager;
}

String getNetworkType() {
Expand All @@ -40,44 +36,6 @@ String getNetworkType() {
return getNetworkTypeLegacy();
}

String getWifiName() {
WifiInfo wifiInfo = getWifiInfo();
String ssid = null;
if (wifiInfo != null) ssid = wifiInfo.getSSID();
if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID"
return ssid;
}

String getWifiBSSID() {
WifiInfo wifiInfo = getWifiInfo();
String bssid = null;
if (wifiInfo != null) {
bssid = wifiInfo.getBSSID();
}
return bssid;
}

String getWifiIPAddress() {
WifiInfo wifiInfo = null;
if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo();

String ip = null;
int i_ip = 0;
if (wifiInfo != null) i_ip = wifiInfo.getIpAddress();

if (i_ip != 0)
ip =
String.format(
"%d.%d.%d.%d",
(i_ip & 0xff), (i_ip >> 8 & 0xff), (i_ip >> 16 & 0xff), (i_ip >> 24 & 0xff));

return ip;
}

private WifiInfo getWifiInfo() {
return wifiManager == null ? null : wifiManager.getConnectionInfo();
}

@SuppressWarnings("deprecation")
private String getNetworkTypeLegacy() {
// handle type for Android versions less than Android 9
Expand Down
9 changes: 0 additions & 9 deletions ...droid/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
case "check":
result.success(connectivity.getNetworkType());
break;
case "wifiName":
result.success(connectivity.getWifiName());
break;
case "wifiBSSID":
result.success(connectivity.getWifiBSSID());
break;
case "wifiIPAddress":
result.success(connectivity.getWifiIPAddress());
break;
default:
result.notImplemented();
break;
Expand Down
5 changes: 1 addition & 4 deletions ...onnectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

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.BinaryMessenger;
import io.flutter.plugin.common.EventChannel;
Expand Down Expand Up @@ -41,10 +40,8 @@ private void setupChannels(BinaryMessenger messenger, Context context) {
eventChannel = new EventChannel(messenger, "plugins.flutter.io/connectivity_status");
ConnectivityManager connectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
WifiManager wifiManager =
(WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);

Connectivity connectivity = new Connectivity(connectivityManager, wifiManager);
Connectivity connectivity = new Connectivity(connectivityManager);

ConnectivityMethodChannelHandler methodChannelHandler =
new ConnectivityMethodChannelHandler(connectivity);
Expand Down