diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java index 8aa9d8fef06..97ee71ab93e 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.os.Bundle; import android.util.Log; +import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -62,6 +63,14 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements public static final String ACTION_PROCESS_WIFI_DPP_QR_CODE = "android.settings.PROCESS_WIFI_DPP_QR_CODE"; + // Key for Bundle usage + private static final String KEY_QR_CODE = "key_qr_code"; + private static final String KEY_WIFI_SECURITY = "key_wifi_security"; + private static final String KEY_WIFI_SSID = "key_wifi_ssid"; + private static final String KEY_WIFI_PRESHARED_KEY = "key_wifi_preshared_key"; + private static final String KEY_WIFI_HIDDEN_SSID = "key_wifi_hidden_ssid"; + private static final String KEY_WIFI_NETWORK_ID = "key_wifi_network_id"; + private FragmentManager mFragmentManager; /** The Wi-Fi network which will be configured */ @@ -79,6 +88,21 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + String qrCode = savedInstanceState.getString(KEY_QR_CODE); + + mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode); + + String security = savedInstanceState.getString(KEY_WIFI_SECURITY); + String ssid = savedInstanceState.getString(KEY_WIFI_SSID); + String preSharedKey = savedInstanceState.getString(KEY_WIFI_PRESHARED_KEY); + boolean hiddenSsid = savedInstanceState.getBoolean(KEY_WIFI_HIDDEN_SSID); + int networkId = savedInstanceState.getInt(KEY_WIFI_NETWORK_ID); + + mWifiNetworkConfig = WifiNetworkConfig.getValidConfigOrNull(security, ssid, + preSharedKey, hiddenSsid, networkId); + } + setContentView(R.layout.wifi_dpp_activity); mFragmentManager = getSupportFragmentManager(); @@ -227,8 +251,8 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements return mWifiDppQrCode; } - @Override - public boolean setWifiNetworkConfig(WifiNetworkConfig config) { + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + protected boolean setWifiNetworkConfig(WifiNetworkConfig config) { if(!WifiNetworkConfig.isValidConfig(config)) { return false; } else { @@ -237,6 +261,20 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements } } + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + protected boolean setWifiDppQrCode(WifiQrCode wifiQrCode) { + if (wifiQrCode == null) { + return false; + } + + if (!WifiQrCode.SCHEME_DPP.equals(wifiQrCode.getScheme())) { + return false; + } + + mWifiDppQrCode = new WifiQrCode(wifiQrCode.getQrCode()); + return true; + } + @Override public boolean onNavigateUp() { Fragment fragment = mFragmentManager.findFragmentById(R.id.fragment_container); @@ -274,4 +312,21 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements showChooseSavedWifiNetworkFragment(/* addToBackStack */ true); } + + @Override + public void onSaveInstanceState(Bundle outState) { + if (mWifiDppQrCode != null) { + outState.putString(KEY_QR_CODE, mWifiDppQrCode.getQrCode()); + } + + if (mWifiNetworkConfig != null) { + outState.putString(KEY_WIFI_SECURITY, mWifiNetworkConfig.getSecurity()); + outState.putString(KEY_WIFI_SSID, mWifiNetworkConfig.getSsid()); + outState.putString(KEY_WIFI_PRESHARED_KEY, mWifiNetworkConfig.getPreSharedKey()); + outState.putBoolean(KEY_WIFI_HIDDEN_SSID, mWifiNetworkConfig.getHiddenSsid()); + outState.putInt(KEY_WIFI_NETWORK_ID, mWifiNetworkConfig.getNetworkId()); + } + + super.onSaveInstanceState(outState); + } } diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java b/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java index a9e88a9f0a8..915e90def21 100644 --- a/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java +++ b/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java @@ -30,6 +30,7 @@ import android.text.TextUtils; import android.util.Log; import androidx.annotation.Keep; +import androidx.annotation.VisibleForTesting; /** * Wraps the parameters of ZXing reader library's Wi-Fi Network config format. @@ -48,8 +49,9 @@ public class WifiNetworkConfig { private boolean mHiddenSsid; private int mNetworkId; - private WifiNetworkConfig(String security, String ssid, String preSharedKey, boolean hiddenSsid, - int networkId) { + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + protected WifiNetworkConfig(String security, String ssid, String preSharedKey, + boolean hiddenSsid, int networkId) { mSecurity = security; mSsid = ssid; mPreSharedKey = preSharedKey; @@ -71,7 +73,6 @@ public class WifiNetworkConfig { */ public interface Retriever { public WifiNetworkConfig getWifiNetworkConfig(); - public boolean setWifiNetworkConfig(WifiNetworkConfig config); } /** diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java index 62a7c07e8e3..215b7e2dc31 100644 --- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java +++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.dpp; import static com.google.common.truth.Truth.assertThat; import android.content.Intent; +import android.content.pm.ActivityInfo; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; @@ -29,6 +30,10 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class WifiDppConfiguratorActivityTest { + // Valid Wi-Fi DPP QR code & it's parameters + private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:" + + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;"; + @Rule public final ActivityTestRule mActivityRule = new ActivityTestRule<>(WifiDppConfiguratorActivity.class); @@ -62,9 +67,7 @@ public class WifiDppConfiguratorActivityTest { public void launchActivity_chooseSavedWifiNetwork_shouldNotAutoFinish() { Intent intent = new Intent( WifiDppConfiguratorActivity.ACTION_PROCESS_WIFI_DPP_QR_CODE); - String qrCode = "DPP:I:SN=4774LH2b4044;M:010203040506;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD" - + "IgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;"; - intent.putExtra(WifiDppUtils.EXTRA_QR_CODE, qrCode); + intent.putExtra(WifiDppUtils.EXTRA_QR_CODE, VALID_WIFI_DPP_QR_CODE); mActivityRule.launchActivity(intent); @@ -109,4 +112,51 @@ public class WifiDppConfiguratorActivityTest { assertThat(activity instanceof WifiDppAddDeviceFragment .OnClickChooseDifferentNetworkListener).isEqualTo(true); } + + @Test + public void rotateScreen_shouldGetCorrectWifiDppQrCode() { + WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE); + Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER); + intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP"); + intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest"); + intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password"); + + // setWifiDppQrCode and check if getWifiDppQrCode correctly after rotation + mActivityRule.launchActivity(intent); + mActivityRule.getActivity().setWifiDppQrCode(wifiQrCode); + mActivityRule.getActivity().setRequestedOrientation( + ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + mActivityRule.getActivity().setRequestedOrientation( + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + WifiQrCode restoredWifiDppQrCode = mActivityRule.getActivity().getWifiDppQrCode(); + + assertThat(restoredWifiDppQrCode).isNotNull(); + assertThat(restoredWifiDppQrCode.getQrCode()).isEqualTo(VALID_WIFI_DPP_QR_CODE); + } + + @Test + public void rotateScreen_shouldGetCorrectWifiNetworkConfig() { + WifiNetworkConfig wifiNetworkConfig = new WifiNetworkConfig("WPA", "WifiSsid", "password", + /* hiddenSsid */ false, /* networkId */ 0); + Intent intent = new Intent( + WifiDppConfiguratorActivity.ACTION_PROCESS_WIFI_DPP_QR_CODE); + intent.putExtra(WifiDppUtils.EXTRA_QR_CODE, VALID_WIFI_DPP_QR_CODE); + + // setWifiNetworkConfig and check if getWifiNetworkConfig correctly after rotation + mActivityRule.launchActivity(intent); + mActivityRule.getActivity().setWifiNetworkConfig(wifiNetworkConfig); + mActivityRule.getActivity().setRequestedOrientation( + ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + mActivityRule.getActivity().setRequestedOrientation( + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + WifiNetworkConfig restoredWifiNetworkConfig = + mActivityRule.getActivity().getWifiNetworkConfig(); + + assertThat(restoredWifiNetworkConfig).isNotNull(); + assertThat(restoredWifiNetworkConfig.getSecurity()).isEqualTo("WPA"); + assertThat(restoredWifiNetworkConfig.getSsid()).isEqualTo("WifiSsid"); + assertThat(restoredWifiNetworkConfig.getPreSharedKey()).isEqualTo("password"); + assertThat(restoredWifiNetworkConfig.getHiddenSsid()).isFalse(); + assertThat(restoredWifiNetworkConfig.getNetworkId()).isEqualTo(0); + } }