Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev (eac45c6a) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -11816,6 +11816,8 @@
		<string name="network_connection_errorstate_dialog_message">Something came up. The application has cancelled the request to choose a device.</string>
		<!-- Toast message when connection is successful [CHAR LIMIT=30] -->
		<string name="network_connection_connect_successful">Connection successful</string>
		<!-- Toast message when connection is failure [CHAR LIMIT=30] -->
		<string name="network_connection_connect_failure">Connection failed</string>
		<!-- Neutral button for Network connection request Dialog [CHAR LIMIT=30] -->
		<string name="network_connection_request_dialog_showall">Show all</string>
		<!-- Message for Network connection searching progress Dialog. Searching for wifi ap. [CHAR LIMIT=40] -->

+5 −6

Original line number	Diff line number	Diff line
		@@ -216,13 +216,12 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements

		@Override
		public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
		if (mIsSpecifiedSsid) {
		showSingleSsidRequestDialog(
		WifiInfo.sanitizeSsid(mMatchedConfig.SSID), true /* isTryAgain */);
		return;
		if (!isFinishing()) {
		Toast.makeText(this, R.string.network_connection_connect_failure, Toast.LENGTH_SHORT)
		.show();
		setResult(RESULT_OK);
		finish();
		}

		mDialogFragment.onUserSelectionConnectFailure(wificonfiguration);
		}

		// Called when user click "Connect" button. Called by

+0 −4

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.net.wifi.ScanResult;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;

		import androidx.annotation.NonNull;
		@@ -91,7 +90,4 @@ abstract public class NetworkRequestDialogBaseFragment extends InstrumentedDialo

		protected void onMatch(List<ScanResult> scanResults) {
		}

		protected void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
		}
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -324,11 +324,6 @@ public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragme
		}
		}

		@Override
		public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
		// Do nothing when selection is failed, let user could try again easily.
		}

		@VisibleForTesting
		final class FilterWifiTracker {
		private final List<String> mAccessPointKeys;

+9 −0

Original line number	Diff line number	Diff line
		@@ -126,4 +126,13 @@ public class NetworkRequestDialogActivityTest {

		verify(mActivity).finish();
		}

		@Test
		public void updateAccessPointList_onUserSelectionConnectFailure_shouldFinishActivity() {
		final WifiConfiguration config = new WifiConfiguration();
		config.SSID = "Test AP 3";
		mActivity.onUserSelectionConnectFailure(config);

		verify(mActivity).finish();
		}
		}