import android.app.ActionBar;
import android.app.settings.SettingsEnums;
import android.content.Intent;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.provider.Settings;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.core.InstrumentedActivity;
+import java.util.List;
+
/**
* To provision "other" device with specified Wi-Fi network.
*
WifiNetworkConfig.Retriever,
WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,
WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,
- WifiDppQrCodeScannerFragment.OnScanZxingWifiFormatSuccessListener,
WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener,
WifiNetworkListFragment.OnChooseNetworkListener {
/** The Wi-Fi DPP QR code from intent ACTION_PROCESS_WIFI_EASY_CONNECT_QR_CODE */
private WifiQrCode mWifiDppQrCode;
+
/** Secret extra that allows fake networks to show in UI for testing purposes */
private boolean mIsTest;
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setContentView(R.layout.wifi_dpp_activity);
+ mFragmentManager = getSupportFragmentManager();
+
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);
mWifiNetworkConfig = WifiNetworkConfig.getValidConfigOrNull(security, ssid,
preSharedKey, hiddenSsid, networkId);
+ } else {
+ handleIntent(getIntent());
}
- setContentView(R.layout.wifi_dpp_activity);
- mFragmentManager = getSupportFragmentManager();
-
- handleIntent(getIntent());
-
ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setElevation(0);
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");
if (mWifiDppQrCode == null || !isDppSupported) {
cancelActivity = true;
} else {
- showChooseSavedWifiNetworkFragment(/* addToBackStack */ false);
+ final WifiNetworkConfig connectedConfig = getConnectedWifiNetworkConfigOrNull();
+ if (connectedConfig == null || !connectedConfig.isSupportWifiDpp(this)) {
+ showChooseSavedWifiNetworkFragment(/* addToBackStack */ false);
+ } else {
+ mWifiNetworkConfig = connectedConfig;
+ showAddDeviceFragment(/* addToBackStack */ false);
+ }
}
break;
default:
WifiDppQrCodeScannerFragment fragment =
(WifiDppQrCodeScannerFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
- // Avoid to replace the same fragment during configuration change
- if (fragment != null && fragment.isVisible()) {
- return;
- }
if (fragment == null) {
fragment = new WifiDppQrCodeScannerFragment();
+ } else {
+ if (fragment.isVisible()) {
+ return;
+ }
+
+ // When the fragment in back stack but not on top of the stack, we can simply pop
+ // stack because current fragment transactions are arranged in an order
+ mFragmentManager.popBackStackImmediate();
+ return;
}
final FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction();
WifiDppQrCodeGeneratorFragment fragment =
(WifiDppQrCodeGeneratorFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_GENERATOR);
- // Avoid to replace the same fragment during configuration change
- if (fragment != null && fragment.isVisible()) {
+
+ if (fragment == null) {
+ fragment = new WifiDppQrCodeGeneratorFragment();
+ } else {
+ if (fragment.isVisible()) {
+ return;
+ }
+
+ // When the fragment in back stack but not on top of the stack, we can simply pop
+ // stack because current fragment transactions are arranged in an order
+ mFragmentManager.popBackStackImmediate();
return;
}
-
- fragment = new WifiDppQrCodeGeneratorFragment();
final FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction();
fragmentTransaction.replace(R.id.fragment_container, fragment,
WifiDppChooseSavedWifiNetworkFragment fragment =
(WifiDppChooseSavedWifiNetworkFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK);
- // Avoid to replace the same fragment during configuration change
- if (fragment != null && fragment.isVisible()) {
- return;
- }
if (fragment == null) {
fragment = new WifiDppChooseSavedWifiNetworkFragment();
bundle.putBoolean(WifiDppUtils.EXTRA_TEST, true);
fragment.setArguments(bundle);
}
+ } else {
+ if (fragment.isVisible()) {
+ return;
+ }
+
+ // When the fragment in back stack but not on top of the stack, we can simply pop
+ // stack because current fragment transactions are arranged in an order
+ mFragmentManager.popBackStackImmediate();
+ return;
}
final FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction();
(WifiDppAddDeviceFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_ADD_DEVICE);
- // Avoid to replace the same fragment during configuration change
- if (mFragmentManager.findFragmentByTag(
- WifiDppUtils.TAG_FRAGMENT_ADD_DEVICE) != null) {
- return;
- }
-
if (fragment == null) {
fragment = new WifiDppAddDeviceFragment();
+ } else {
+ if (fragment.isVisible()) {
+ return;
+ }
+
+ // When the fragment in back stack but not on top of the stack, we can simply pop
+ // stack because current fragment transactions are arranged in an order
+ mFragmentManager.popBackStackImmediate();
+ return;
}
final FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction();
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;
}
@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);
}
showAddDeviceFragment(/* addToBackStack */ true);
}
+
+ private WifiNetworkConfig getConnectedWifiNetworkConfigOrNull() {
+ final WifiManager wifiManager = getSystemService(WifiManager.class);
+ if (!wifiManager.isWifiEnabled()) {
+ return null;
+ }
+
+ final WifiInfo connectionInfo = wifiManager.getConnectionInfo();
+ if (connectionInfo == null) {
+ return null;
+ }
+
+ final int connectionNetworkId = connectionInfo.getNetworkId();
+ final List<WifiConfiguration> configs = wifiManager.getConfiguredNetworks();
+ for (WifiConfiguration wifiConfiguration : configs) {
+ if (wifiConfiguration.networkId == connectionNetworkId) {
+ return WifiNetworkConfig.getValidConfigOrNull(
+ WifiDppUtils.getSecurityString(wifiConfiguration),
+ wifiConfiguration.getPrintableSsid(),
+ wifiConfiguration.preSharedKey,
+ /* hiddenSsid */ false,
+ wifiConfiguration.networkId);
+ }
+ }
+
+ return null;
+ }
}
OSDN Git Service
