mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
if (mFilterWifiTracker == null) {
- mFilterWifiTracker = new FilterWifiTracker(getActivity(), getSettingsLifecycle());
+ mFilterWifiTracker = new FilterWifiTracker(getContext(), getSettingsLifecycle());
}
mFilterWifiTracker.onResume();
}
private final class FilterWifiTracker {
private final List<String> mAccessPointKeys;
private final WifiTracker mWifiTracker;
+ private final Context mContext;
public FilterWifiTracker(Context context, Lifecycle lifecycle) {
mWifiTracker = WifiTrackerFactory.create(context, mWifiListener,
lifecycle, /* includeSaved */ true, /* includeScans */ true);
mAccessPointKeys = new ArrayList<>();
+ mContext = context;
}
/**
*/
public void updateKeys(List<ScanResult> scanResults) {
for (ScanResult scanResult : scanResults) {
- final String key = AccessPoint.getKey(scanResult);
+ final String key = AccessPoint.getKey(mContext, scanResult);
if (!mAccessPointKeys.contains(key)) {
mAccessPointKeys.add(key);
}
}
}
- /**
- * Special handling for WPA2/WPA3 and OWE in Transition mode: The key
- * SECURITY_PSK_SAE_TRANSITION and SECURITY_OWE_TRANSITION are pseudo keys which result by the
- * scan results, but never appears in the saved networks.
- * A saved network is either WPA3 for supporting devices or WPA2 for non-supporting devices,
- * or, OWE for supporting devices or Open for non-supporting devices.
- *
- * @param accessPointSecurity Access point current security type
- * @return Converted security type (if required)
- */
- private int convertSecurityTypeForMatching(int accessPointSecurity) {
- if (accessPointSecurity == AccessPoint.SECURITY_PSK_SAE_TRANSITION) {
- if (mWifiManager.isWpa3SaeSupported()) {
- return AccessPoint.SECURITY_SAE;
- } else {
- return AccessPoint.SECURITY_PSK;
- }
- }
- if (accessPointSecurity == AccessPoint.SECURITY_OWE_TRANSITION) {
- if (mWifiManager.isEnhancedOpenSupported()) {
- return AccessPoint.SECURITY_OWE;
- } else {
- return AccessPoint.SECURITY_NONE;
- }
- }
-
- return accessPointSecurity;
- }
-
public WifiConfiguration getConfig() {
if (mMode == WifiConfigUiBase.MODE_VIEW) {
return null;
config.shared = mSharedCheckBox.isChecked();
- mAccessPointSecurity = convertSecurityTypeForMatching(mAccessPointSecurity);
-
switch (mAccessPointSecurity) {
case AccessPoint.SECURITY_NONE:
config.allowedKeyManagement.set(KeyMgmt.NONE);
private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) {
if (mAccessPointSecurity == AccessPoint.SECURITY_NONE ||
- mAccessPointSecurity == AccessPoint.SECURITY_OWE ||
- mAccessPointSecurity == AccessPoint.SECURITY_OWE_TRANSITION) {
+ mAccessPointSecurity == AccessPoint.SECURITY_OWE) {
mView.findViewById(R.id.security_fields).setVisibility(View.GONE);
return;
}
if (isSavedNetwork) {
connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
} else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
- (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE) ||
- (mSelectedAccessPoint.getSecurity()
- == AccessPoint.SECURITY_OWE_TRANSITION)) {
+ (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
/** Bypass dialog for unsecured networks */
mSelectedAccessPoint.generateOpenNetworkConfig();
connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);
preference.setOrder(index);
if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
&& (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE &&
- accessPoint.getSecurity() != AccessPoint.SECURITY_OWE &&
- accessPoint.getSecurity() != AccessPoint.SECURITY_OWE_TRANSITION)) {
+ accessPoint.getSecurity() != AccessPoint.SECURITY_OWE)) {
if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) {
onPreferenceTreeClick(preference);
mOpenSsid = null;
if (accessPoint.isOsuProvider()) {
return CONNECT_TYPE_OSU_PROVISION;
} else if ((accessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
- (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE) ||
- (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE_TRANSITION)) {
+ (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
return CONNECT_TYPE_OPEN_NETWORK;
} else if (accessPoint.isSaved() && config != null
&& config.getNetworkSelectionStatus() != null
setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);
// For a transition mode Wi-Fi AP, creates a QR code that's compatible with more devices
- if (accessPoint.getSecurity() == AccessPoint.SECURITY_PSK_SAE_TRANSITION) {
+ if (accessPoint.isPskSaeTransitionMode()) {
intent.putExtra(EXTRA_WIFI_SECURITY, WifiQrCode.SECURITY_WPA_PSK);
}
}
break;
case AccessPoint.SECURITY_PSK:
- case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
return true;
default:
}
case AccessPoint.SECURITY_PSK:
case AccessPoint.SECURITY_WEP:
case AccessPoint.SECURITY_NONE:
- case AccessPoint.SECURITY_PSK_SAE_TRANSITION:
- case AccessPoint.SECURITY_OWE_TRANSITION:
return true;
case AccessPoint.SECURITY_SAE:
if (wifiManager.isWpa3SaeSupported()) {