Handle different error codes in DPP
Show error message for corresponding Wi-Fi DPP error code. And 1. To update error message only from each fragment, remove some callbacks which calls from fragment to activity. 2. After clicking 'Share Wi-Fi' button, hide it before Wi-Fi DPP handshake completes. 3. Show 'Done' button for some error codes. 4. Use ViewModel to call startEasyConnectAsConfiguratorInitiator and startEasyConnectAsEnrolleeInitiator because a lifecycle object does not receive an Executor callback after configurator change. 5. In WifiDppQrCodeScannerFragment, show an error message for 10s instead of 2s since new added error messages may carry more information. 6. Show a different error message for enrollee handshake success but Wi-Fi connection fail case. 7. stop camera when scanned a Wi-Fi DPP QR code for enrollee. 8. In QR code scanner fragment, support to show error message after configuration change. Bug: 124247872 Bug: 124491247 Test: manual test atest WifiQrCodeTest atest WifiDppConfiguratorActivityTest atest WifiDppEnrolleeActivityTest atest WifiDppQrCodeGeneratorFragmentTest atest WifiDppQrCodeScannerFragmentTest atest WifiNetworkListFragmentTest atest WifiDppChooseSavedWifiNetworkFragmentTest Change-Id: Id130215e9ddafac8bc4c68238deda48ce99b4255
This commit is contained in:
@@ -57,7 +57,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
|
||||
WifiNetworkConfig.Retriever,
|
||||
WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,
|
||||
WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,
|
||||
WifiDppQrCodeScannerFragment.OnScanZxingWifiFormatSuccessListener,
|
||||
WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener,
|
||||
WifiNetworkListFragment.OnChooseNetworkListener {
|
||||
|
||||
@@ -102,7 +101,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
|
||||
if (savedInstanceState != null) {
|
||||
String qrCode = savedInstanceState.getString(KEY_QR_CODE);
|
||||
|
||||
mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);
|
||||
mWifiDppQrCode = WifiQrCode.getValidWifiDppQrCodeOrNull(qrCode);
|
||||
|
||||
String security = savedInstanceState.getString(KEY_WIFI_SECURITY);
|
||||
String ssid = savedInstanceState.getString(KEY_WIFI_SSID);
|
||||
@@ -148,7 +147,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
|
||||
case Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE:
|
||||
String qrCode = intent.getStringExtra(Settings.EXTRA_QR_CODE);
|
||||
mIsTest = intent.getBooleanExtra(WifiDppUtils.EXTRA_TEST, false);
|
||||
mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);
|
||||
mWifiDppQrCode = WifiQrCode.getValidWifiDppQrCodeOrNull(qrCode);
|
||||
final boolean isDppSupported = WifiDppUtils.isWifiDppEnabled(this);
|
||||
if (!isDppSupported) {
|
||||
Log.d(TAG, "Device doesn't support Wifi DPP");
|
||||
@@ -285,21 +284,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
|
||||
fragmentTransaction.commit();
|
||||
}
|
||||
|
||||
private WifiQrCode getValidWifiDppQrCodeOrNull(String qrCode) {
|
||||
WifiQrCode wifiQrCode;
|
||||
try {
|
||||
wifiQrCode = new WifiQrCode(qrCode);
|
||||
} catch(IllegalArgumentException e) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (WifiQrCode.SCHEME_DPP.equals(wifiQrCode.getScheme())) {
|
||||
return wifiQrCode;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public WifiNetworkConfig getWifiNetworkConfig() {
|
||||
return mWifiNetworkConfig;
|
||||
@@ -358,11 +342,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
|
||||
showAddDeviceFragment(/* addToBackStack */ true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onScanZxingWifiFormatSuccess(WifiNetworkConfig wifiNetworkConfig) {
|
||||
// Do nothing, it's impossible to be a configurator without a Wi-Fi DPP QR code
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClickChooseDifferentNetwork() {
|
||||
showChooseSavedWifiNetworkFragment(/* addToBackStack */ true);
|
||||
|
Reference in New Issue
Block a user