Add Hotspot WPA3 Settings
- Add WPA3 SAE security types - "WPA3-Personal" - "WPA2/WPA3-Personal" - Verify valid WPA3 password - Enable QR code scanner for Hotspot WPA3 - Avoid null point exception when settings keyword searching - Screenshot https://screenshot.googleplex.com/B6u54wh8w35Xnyf https://screenshot.googleplex.com/8hWHHUTb6UaS9vB Bug: 167968488 Test: manual test - atest WifiTetherSecurityPreferenceControllerTest - atest WifiUtilsTest Change-Id: I2992040498f8add107a4cce70a92c1c6ee6ab805
This commit is contained in:
Weng Su
@@ -1,105 +0,0 @@
|
||||
package com.android.settings.wifi.tether;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.wifi.SoftApConfiguration;
|
||||
import android.net.wifi.WifiManager;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class WifiTetherSecurityPreferenceControllerTest {
|
||||
|
||||
private static final String WPA2_PSK =
|
||||
String.valueOf(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
private static final String NONE = String.valueOf(SoftApConfiguration.SECURITY_TYPE_OPEN);
|
||||
@Mock
|
||||
private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private ConnectivityManager mConnectivityManager;
|
||||
@Mock
|
||||
private WifiManager mWifiManager;
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
private WifiTetherSecurityPreferenceController mController;
|
||||
private ListPreference mPreference;
|
||||
private SoftApConfiguration mConfig;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mConfig = new SoftApConfiguration.Builder().setSsid("test_1234")
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
|
||||
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig);
|
||||
when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
|
||||
.thenReturn(mConnectivityManager);
|
||||
when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
|
||||
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
|
||||
|
||||
mController = new WifiTetherSecurityPreferenceController(mContext, mListener);
|
||||
mPreference = new ListPreference(RuntimeEnvironment.application);
|
||||
mController.mPreference = mPreference;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_securityValueUpdated() {
|
||||
mController.onPreferenceChange(mPreference, WPA2_PSK);
|
||||
assertThat(mController.getSecurityType()).isEqualTo(
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
|
||||
mController.onPreferenceChange(mPreference, NONE);
|
||||
assertThat(mController.getSecurityType()).isEqualTo(
|
||||
SoftApConfiguration.SECURITY_TYPE_OPEN);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("None");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_preferenceUpdated() {
|
||||
// test defaulting to WPA2-Personal on new config
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(null);
|
||||
mController.updateDisplay();
|
||||
assertThat(mController.getSecurityType()).isEqualTo(
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
|
||||
// test open tether network
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase(null, SoftApConfiguration.SECURITY_TYPE_OPEN).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
mController.updateDisplay();
|
||||
assertThat(mController.getSecurityType()).isEqualTo(
|
||||
SoftApConfiguration.SECURITY_TYPE_OPEN);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("None");
|
||||
|
||||
// test WPA2-Personal tether network
|
||||
SoftApConfiguration config2 = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config2);
|
||||
mController.updateDisplay();
|
||||
assertThat(mController.getSecurityType()).isEqualTo(
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.net.wifi.SoftApConfiguration;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
@@ -46,12 +47,48 @@ public class WifiUtilsTest {
|
||||
public void testPassword() {
|
||||
final String longPassword = "123456789012345678901234567890"
|
||||
+ "1234567890123456789012345678901234567890";
|
||||
assertThat(WifiUtils.isHotspotWpa2PasswordValid("123")).isFalse();
|
||||
assertThat(WifiUtils.isHotspotWpa2PasswordValid("12345678")).isTrue();
|
||||
assertThat(WifiUtils.isHotspotWpa2PasswordValid("1234567890")).isTrue();
|
||||
assertThat(WifiUtils.isHotspotWpa2PasswordValid(longPassword)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotWpa2PasswordValid("")).isFalse();
|
||||
assertThat(WifiUtils.isHotspotWpa2PasswordValid("€¥£")).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("123",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("12345678",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("1234567890",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid(longPassword,
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("€¥£",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)).isFalse();
|
||||
|
||||
// The WPA3_SAE_TRANSITION password limitation should be same as WPA2_PSK
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("123",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("12345678",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("1234567890",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid(longPassword,
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("€¥£",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION)).isFalse();
|
||||
|
||||
// The WA3_SAE password is requested that length > 1 only.
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isFalse();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("1",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("123",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("12345678",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("1234567890",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid(longPassword,
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isTrue();
|
||||
assertThat(WifiUtils.isHotspotPasswordValid("€¥£",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -0,0 +1,206 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.wifi.tether;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.wifi.SoftApConfiguration;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.os.Looper;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class WifiTetherSecurityPreferenceControllerTest {
|
||||
|
||||
private static final String PREF_KEY = "wifi_tether_security";
|
||||
private static final String WPA3_SAE =
|
||||
String.valueOf(SoftApConfiguration.SECURITY_TYPE_WPA3_SAE);
|
||||
private static final String WPA3_SAE_TRANSITION =
|
||||
String.valueOf(SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
private static final String WPA2_PSK =
|
||||
String.valueOf(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
private static final String NONE = String.valueOf(SoftApConfiguration.SECURITY_TYPE_OPEN);
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private WifiManager mWifiManager;
|
||||
@Mock
|
||||
private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
|
||||
|
||||
private WifiTetherSecurityPreferenceController mController;
|
||||
private ListPreference mPreference;
|
||||
private SoftApConfiguration mConfig;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
final Context context = spy(ApplicationProvider.getApplicationContext());
|
||||
mConfig = new SoftApConfiguration.Builder().setSsid("test_1234")
|
||||
.setPassphrase(null, SoftApConfiguration.SECURITY_TYPE_OPEN).build();
|
||||
when(context.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig);
|
||||
|
||||
mController = new WifiTetherSecurityPreferenceController(context, mListener);
|
||||
if (Looper.myLooper() == null) {
|
||||
Looper.prepare();
|
||||
}
|
||||
final PreferenceManager preferenceManager = new PreferenceManager(context);
|
||||
final PreferenceScreen screen = preferenceManager.createPreferenceScreen(context);
|
||||
mPreference = new ListPreference(context);
|
||||
mPreference.setKey(PREF_KEY);
|
||||
screen.addPreference(mPreference);
|
||||
mController.displayPreference(screen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_toWpa3Sae_shouldUpdateSecurityValue() {
|
||||
mController.onPreferenceChange(mPreference, WPA3_SAE);
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA3_SAE);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA3-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_toWpa3SaeTransition_shouldUpdateSecurityValue() {
|
||||
mController.onPreferenceChange(mPreference, WPA3_SAE_TRANSITION);
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2/WPA3-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_toWpa2Psk_shouldUpdateSecurityValue() {
|
||||
mController.onPreferenceChange(mPreference, WPA2_PSK);
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChange_toNone_shouldUpdateSecurityValue() {
|
||||
mController.onPreferenceChange(mPreference, NONE);
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_OPEN);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("None");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_toWpa3Sae_shouldUpdateSecurityValue() {
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
|
||||
mController.updateDisplay();
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA3_SAE);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA3-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_toWpa3SaeTransition_shouldUpdateSecurityValue() {
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
|
||||
mController.updateDisplay();
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2/WPA3-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_toWpa2Psk_shouldUpdateSecurityValue() {
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
|
||||
mController.updateDisplay();
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_toNone_shouldUpdateSecurityValue() {
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase(null, SoftApConfiguration.SECURITY_TYPE_OPEN).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
|
||||
mController.updateDisplay();
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_OPEN);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("None");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_toWpa3SaeButNotSupportWpa3_shouldBeDefaultToWpa2() {
|
||||
mController.mIsWpa3Supported = false;
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
|
||||
mController.updateDisplay();
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateDisplay_toWpa3SaeTransitionButNotSupportWpa3_shouldBeDefaultToWpa2() {
|
||||
mController.mIsWpa3Supported = false;
|
||||
SoftApConfiguration config = new SoftApConfiguration.Builder(mConfig)
|
||||
.setPassphrase("test_password",
|
||||
SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION).build();
|
||||
when(mWifiManager.getSoftApConfiguration()).thenReturn(config);
|
||||
|
||||
mController.updateDisplay();
|
||||
|
||||
assertThat(mController.getSecurityType())
|
||||
.isEqualTo(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo("WPA2-Personal");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user