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

Refer to the last Hotspot password when generating the password

Browse Source 
- Query the last Hotspot password when security type is SECURITY_TYPE_OPEN and it will be used when the user changes to another security type

- If the last hotspot password is an empty string, then generate random password

Bug: 201789473
Test: manual test
atest -c WifiHotspotRepositoryTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest

Change-Id: Id3a846099238433e7b6c8b934fa26a74df0dcb61
This commit is contained in:
Weng Su
2023-02-22 10:32:11 +08:00
parent 1acdb1452d
commit d7bbd4505c
10 changed files with 303 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,10 +33,9 @@ import com.android.settings.core.FeatureFlags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settings.wifi.WifiUtils;
import com.android.settings.wifi.repository.WifiHotspotRepository;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.UUID;
/**
* Controller for logic pertaining to the password of Wi-Fi tethering.
*/
@@ -49,18 +48,22 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
private int mSecurityType;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final WifiHotspotRepository mWifiHotspotRepository;
@VisibleForTesting
WifiTetherPasswordPreferenceController(Context context, OnTetherConfigUpdateListener listener,
MetricsFeatureProvider provider) {
super(context, listener);
mMetricsFeatureProvider = provider;
FeatureFactory featureFactory = FeatureFactory.getFactory(context);
mMetricsFeatureProvider = (provider != null) ? provider
: featureFactory.getMetricsFeatureProvider();
mWifiHotspotRepository = featureFactory.getWifiFeatureProvider().getWifiHotspotRepository();
mWifiHotspotRepository.queryLastPasswordIfNeeded();
}
public WifiTetherPasswordPreferenceController(Context context,
OnTetherConfigUpdateListener listener) {
super(context, listener);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
this(context, listener, null /* MetricsFeatureProvider */);
}
@Override
@@ -74,7 +77,7 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
if (config.getSecurityType() != SoftApConfiguration.SECURITY_TYPE_OPEN
&& TextUtils.isEmpty(config.getPassphrase())) {
mPassword = generateRandomPassword();
mPassword = mWifiHotspotRepository.generatePassword();
} else {
mPassword = config.getPassphrase();
}
@@ -110,7 +113,7 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
if (securityType == SoftApConfiguration.SECURITY_TYPE_OPEN) {
return "";
} else if (!WifiUtils.isHotspotPasswordValid(mPassword, securityType)) {
mPassword = generateRandomPassword();
mPassword = mWifiHotspotRepository.generatePassword();
updatePasswordDisplay((EditTextPreference) mPreference);
}
return mPassword;
@@ -132,12 +135,6 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
return WifiUtils.isHotspotPasswordValid(value, mSecurityType);
}
private static String generateRandomPassword() {
String randomUUID = UUID.randomUUID().toString();
//first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
return randomUUID.substring(0, 8) + randomUUID.substring(9, 13);
}
private void updatePasswordDisplay(EditTextPreference preference) {
ValidatedEditTextPreference pref = (ValidatedEditTextPreference) preference;
pref.setText(mPassword);