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

Merge "[Wi-Fi DPP] Improve Wi-Fi QR code error messages"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-19 10:05:45 +00:00
committed by Android (Google) Code Review
parent 11e1d45c9c d2dc5438fa
commit 8d51b1b4e8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -2187,8 +2187,6 @@
<string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d and share the password</string> <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d and share the password</string>
<!-- Hint for the user to use another device to scan QR code on screen to join a open Wi-Fi [CHAR LIMIT=NONE] --> <!-- Hint for the user to use another device to scan QR code on screen to join a open Wi-Fi [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string> <string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
<!-- Hint for QR code detection [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code. Re-center code and try again</string>
<!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] --> <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_failure_authentication_or_configuration">Try again. If the issue continues, contact the device manufacturer</string> <string name="wifi_dpp_failure_authentication_or_configuration">Try again. If the issue continues, contact the device manufacturer</string>
<!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] --> <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
@@ -2233,6 +2231,8 @@
<string name="wifi_dpp_add_device">Add device</string> <string name="wifi_dpp_add_device">Add device</string>
<!-- Hint for "Add device" [CHAR LIMIT=NONE] --> <!-- Hint for "Add device" [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_connect_network_using_qr_code">Use a QR code to add a device to this network</string> <string name="wifi_dpp_connect_network_using_qr_code">Use a QR code to add a device to this network</string>
<!-- Hint for QR code process failure [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>
<!-- Label for the try again button [CHAR LIMIT=20]--> <!-- Label for the try again button [CHAR LIMIT=20]-->
<string name="retry">Retry</string> <string name="retry">Retry</string>
<!-- Label for the check box to share a network with other users on the same device --> <!-- Label for the check box to share a network with other users on the same device -->

2
src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
View File

@@ -102,7 +102,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
private void showErrorUi(int code, boolean isConfigurationChange) { private void showErrorUi(int code, boolean isConfigurationChange) {
switch (code) { switch (code) {
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI: case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
mSummary.setText(R.string.wifi_dpp_could_not_detect_valid_qr_code); mSummary.setText(R.string.wifi_dpp_qr_code_is_not_valid_format);
break; break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION: case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION:

6
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -433,14 +433,14 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
try { try {
mWifiQrCode = new WifiQrCode(qrCode); mWifiQrCode = new WifiQrCode(qrCode);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code); showErrorMessage(R.string.wifi_dpp_qr_code_is_not_valid_format);
return false; return false;
} }
// It's impossible to provision other device with ZXing Wi-Fi Network config format // It's impossible to provision other device with ZXing Wi-Fi Network config format
final String scheme = mWifiQrCode.getScheme(); final String scheme = mWifiQrCode.getScheme();
if (mIsConfiguratorMode && WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(scheme)) { if (mIsConfiguratorMode && WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(scheme)) {
showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code); showErrorMessage(R.string.wifi_dpp_qr_code_is_not_valid_format);
return false; return false;
} }
@@ -564,7 +564,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
int errorMessageResId = 0; int errorMessageResId = 0;
switch (code) { switch (code) {
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI: case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
errorMessageResId = R.string.wifi_dpp_could_not_detect_valid_qr_code; errorMessageResId = R.string.wifi_dpp_qr_code_is_not_valid_format;
break; break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION: case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION: