Merge "Wi-Fi DPP code refine" (27bbfb73) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -63,7 +63,11 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
		mButtonLeft.setText(R.string.wifi_dpp_add_another_device);
		mButtonLeft.setOnClickListener(v -> getFragmentManager().popBackStack());
		mButtonRight.setText(R.string.done);
		mButtonRight.setOnClickListener(v -> getActivity().finish());
		mButtonRight.setOnClickListener(v -> {
		final Activity activity = getActivity();
		activity.setResult(Activity.RESULT_OK);
		activity.finish();
		});
		}

		@Override
		@@ -138,10 +142,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {

		mButtonLeft = view.findViewById(R.id.button_left);
		mButtonLeft.setText(R.string.cancel);
		mButtonLeft.setOnClickListener(v -> {
		getActivity().setResult(Activity.RESULT_CANCELED);
		getActivity().finish();
		});
		mButtonLeft.setOnClickListener(v -> getActivity().finish());

		mButtonRight = view.findViewById(R.id.button_right);
		mButtonRight.setText(R.string.wifi_dpp_share_wifi);

src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.wifi.dpp;

		import android.app.ActionBar;
		import android.app.Activity;
		import android.app.settings.SettingsEnums;
		import android.content.Intent;
		import android.os.Bundle;
		@@ -100,9 +99,7 @@ public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFrag
		.ACTION_CONFIGURATOR_QR_CODE_GENERATOR.equals(action)) {
		getFragmentManager().popBackStack();
		} else {
		final Activity activity = getActivity();
		activity.setResult(Activity.RESULT_CANCELED);
		activity.finish();
		getActivity().finish();
		}
		});

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings.wifi.dpp;

		import android.app.ActionBar;
		import android.app.Activity;
		import android.app.settings.SettingsEnums;
		import android.content.Intent;
		import android.os.Bundle;
		@@ -160,7 +159,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
		}

		if (cancelActivity) {
		setResult(Activity.RESULT_CANCELED);
		finish();
		}
		}
		@@ -279,8 +277,8 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
		return mWifiDppQrCode;
		}

		@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
		protected boolean setWifiNetworkConfig(WifiNetworkConfig config) {
		@VisibleForTesting
		boolean setWifiNetworkConfig(WifiNetworkConfig config) {
		if(!WifiNetworkConfig.isValidConfig(config)) {
		return false;
		} else {
		@@ -289,8 +287,8 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
		}
		}

		@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
		protected boolean setWifiDppQrCode(WifiQrCode wifiQrCode) {
		@VisibleForTesting
		boolean setWifiDppQrCode(WifiQrCode wifiQrCode) {
		if (wifiQrCode == null) {
		return false;
		}
		@@ -307,7 +305,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
		public boolean onNavigateUp() {
		Fragment fragment = mFragmentManager.findFragmentById(R.id.fragment_container);
		if (fragment instanceof WifiDppQrCodeGeneratorFragment) {
		setResult(Activity.RESULT_CANCELED);
		finish();
		return true;
		} else if (fragment instanceof WifiDppQrCodeScannerFragment) {

src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
		break;
		default:
		Log.e(TAG, "Launch with an invalid action");
		setResult(Activity.RESULT_CANCELED);
		finish();
		}
		}
		@@ -141,7 +140,6 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements

		@Override
		public boolean onNavigateUp(){
		setResult(Activity.RESULT_CANCELED);
		finish();
		return true;
		}

src/com/android/settings/wifi/dpp/WifiDppUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ public class WifiDppUtils {
		case AccessPoint.SECURITY_WEP:
		return WifiQrCode.SECURITY_WEP;
		case AccessPoint.SECURITY_PSK:
		return WifiQrCode.SECURITY_WPA;
		return WifiQrCode.SECURITY_WPA_PSK;
		case AccessPoint.SECURITY_SAE:
		return WifiQrCode.SECURITY_SAE;
		default: