PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add Hotspot WPA3 Settings"

Browse Source 
This reverts commit e0062af10c.

Reason for revert: Bug 176569060 - Droidfood blocking crash in Settings app.

Change-Id: Id50c96e8ce704b19e5ffb9b9a9fcbb0db2d81aee
This commit is contained in:
bsears
2020-12-31 21:16:51 +00:00
parent e0062af10c
commit 598ab32345
10 changed files with 150 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
View File

@@ -43,7 +43,6 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
private static final String PREF_KEY = "wifi_tether_network_password";
private String mPassword;
private int mSecurityType;
private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -69,13 +68,13 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
@Override
public void updateDisplay() {
final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
if (config.getSecurityType() != SoftApConfiguration.SECURITY_TYPE_OPEN
&& TextUtils.isEmpty(config.getPassphrase())) {
if (config == null
|| (config.getSecurityType() == SoftApConfiguration.SECURITY_TYPE_WPA2_PSK
&& TextUtils.isEmpty(config.getPassphrase()))) {
mPassword = generateRandomPassword();
} else {
mPassword = config.getPassphrase();
}
mSecurityType = config.getSecurityType();
((ValidatedEditTextPreference) mPreference).setValidator(this);
((ValidatedEditTextPreference) mPreference).setIsPassword(true);
((ValidatedEditTextPreference) mPreference).setIsSummaryPassword(true);
@@ -106,21 +105,20 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
// don't actually overwrite unless we get a new config in case it was accidentally toggled.
if (securityType == SoftApConfiguration.SECURITY_TYPE_OPEN) {
return "";
} else if (!WifiUtils.isHotspotPasswordValid(mPassword, securityType)) {
} else if (!isTextValid(mPassword)) {
mPassword = generateRandomPassword();
updatePasswordDisplay((EditTextPreference) mPreference);
}
return mPassword;
}
public void setSecurityType(int securityType) {
mSecurityType = securityType;
public void updateVisibility(int securityType) {
mPreference.setVisible(securityType != SoftApConfiguration.SECURITY_TYPE_OPEN);
}
@Override
public boolean isTextValid(String value) {
return WifiUtils.isHotspotPasswordValid(value, mSecurityType);
return WifiUtils.isHotspotWpa2PasswordValid(value);
}
private static String generateRandomPassword() {