Add static IP UI
Remove the existing UI and add per network static IP config option Change-Id: I9b8636e1559de9691144fdb54e20d40985896650
This commit is contained in:
Irfan Sheriff
@@ -19,8 +19,10 @@ package com.android.settings.wifi;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.res.Resources;
|
||||
import android.net.DhcpInfo;
|
||||
import android.net.NetworkInfo.DetailedState;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
import android.net.wifi.WifiConfiguration.IpAssignment;
|
||||
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
|
||||
import android.net.wifi.WifiConfiguration.KeyMgmt;
|
||||
import android.net.wifi.WifiInfo;
|
||||
@@ -37,8 +39,10 @@ import android.widget.ArrayAdapter;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.android.settings.R;
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
/**
|
||||
* The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigPreference} to
|
||||
@@ -54,18 +58,27 @@ public class WifiConfigController implements TextWatcher,
|
||||
|
||||
private boolean mEdit;
|
||||
|
||||
private TextView mSsid;
|
||||
private TextView mSsidView;
|
||||
|
||||
// e.g. AccessPoint.SECURITY_NONE
|
||||
private int mSecurityType;
|
||||
private int mAccessPointSecurity;
|
||||
private TextView mPasswordView;
|
||||
|
||||
private Spinner mEapMethod;
|
||||
private Spinner mEapCaCert;
|
||||
private Spinner mPhase2;
|
||||
private Spinner mEapUserCert;
|
||||
private TextView mEapIdentity;
|
||||
private TextView mEapAnonymous;
|
||||
private Spinner mSecuritySpinner;
|
||||
private Spinner mEapMethodSpinner;
|
||||
private Spinner mEapCaCertSpinner;
|
||||
private Spinner mPhase2Spinner;
|
||||
private Spinner mEapUserCertSpinner;
|
||||
private TextView mEapIdentityView;
|
||||
private TextView mEapAnonymousView;
|
||||
|
||||
private static final String STATIC_IP = "Static";
|
||||
private Spinner mIpSettingsSpinner;
|
||||
private TextView mIpAddressView;
|
||||
private TextView mGatewayView;
|
||||
private TextView mNetmaskView;
|
||||
private TextView mDns1View;
|
||||
private TextView mDns2View;
|
||||
|
||||
static boolean requireKeyStore(WifiConfiguration config) {
|
||||
String values[] = {config.ca_cert.value(), config.client_cert.value(),
|
||||
@@ -84,7 +97,8 @@ public class WifiConfigController implements TextWatcher,
|
||||
|
||||
mView = view;
|
||||
mAccessPoint = accessPoint;
|
||||
mSecurityType = (accessPoint == null) ? AccessPoint.SECURITY_NONE : accessPoint.security;
|
||||
mAccessPointSecurity = (accessPoint == null) ? AccessPoint.SECURITY_NONE :
|
||||
accessPoint.security;
|
||||
mEdit = edit;
|
||||
|
||||
final Context context = mConfigUi.getContext();
|
||||
@@ -93,10 +107,10 @@ public class WifiConfigController implements TextWatcher,
|
||||
if (mAccessPoint == null) {
|
||||
mConfigUi.setTitle(R.string.wifi_add_network);
|
||||
mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
|
||||
mSsid = (TextView) mView.findViewById(R.id.ssid);
|
||||
mSsid.addTextChangedListener(this);
|
||||
((Spinner) mView.findViewById(R.id.security)).setOnItemSelectedListener(this);
|
||||
|
||||
mSsidView = (TextView) mView.findViewById(R.id.ssid);
|
||||
mSsidView.addTextChangedListener(this);
|
||||
mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
|
||||
mSecuritySpinner.setOnItemSelectedListener(this);
|
||||
mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
|
||||
} else {
|
||||
mConfigUi.setTitle(mAccessPoint.ssid);
|
||||
@@ -128,6 +142,7 @@ public class WifiConfigController implements TextWatcher,
|
||||
|
||||
if (mAccessPoint.networkId == -1 || mEdit) {
|
||||
showSecurityFields();
|
||||
showIpConfigFields();
|
||||
}
|
||||
|
||||
if (mEdit) {
|
||||
@@ -135,6 +150,8 @@ public class WifiConfigController implements TextWatcher,
|
||||
} else {
|
||||
if (state == null && level != -1) {
|
||||
mConfigUi.setSubmitButton(context.getString(R.string.wifi_connect));
|
||||
} else {
|
||||
mView.findViewById(R.id.ipfields).setVisibility(View.GONE);
|
||||
}
|
||||
if (mAccessPoint.networkId != -1) {
|
||||
mConfigUi.setForgetButton(context.getString(R.string.wifi_forget));
|
||||
@@ -142,6 +159,15 @@ public class WifiConfigController implements TextWatcher,
|
||||
}
|
||||
}
|
||||
|
||||
mIpSettingsSpinner = ((Spinner) mView.findViewById(R.id.ipsettings));
|
||||
if (mAccessPoint != null && mAccessPoint.networkId != -1) {
|
||||
WifiConfiguration config = mAccessPoint.getConfig();
|
||||
if (config.ipAssignment == IpAssignment.STATIC) {
|
||||
setSelection(mIpSettingsSpinner, STATIC_IP);
|
||||
}
|
||||
}
|
||||
mIpSettingsSpinner.setOnItemSelectedListener(this);
|
||||
|
||||
mConfigUi.setCancelButton(context.getString(R.string.wifi_cancel));
|
||||
if (mConfigUi.getSubmitButton() != null) {
|
||||
enableSubmitIfAppropriate();
|
||||
@@ -155,12 +181,12 @@ public class WifiConfigController implements TextWatcher,
|
||||
group.addView(row);
|
||||
}
|
||||
|
||||
/* show submit button if the password is valid */
|
||||
private void enableSubmitIfAppropriate() {
|
||||
// TODO: make sure this is complete.
|
||||
if ((mSsid != null && mSsid.length() == 0) ||
|
||||
((mAccessPoint == null || mAccessPoint.networkId == -1) &&
|
||||
((mSecurityType == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
|
||||
(mSecurityType == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8)))) {
|
||||
if ((mSsidView != null && mSsidView.length() == 0) ||
|
||||
((mAccessPoint == null || mAccessPoint.networkId == -1) &&
|
||||
((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
|
||||
(mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8)))) {
|
||||
mConfigUi.getSubmitButton().setEnabled(false);
|
||||
} else {
|
||||
mConfigUi.getSubmitButton().setEnabled(true);
|
||||
@@ -176,7 +202,7 @@ public class WifiConfigController implements TextWatcher,
|
||||
|
||||
if (mAccessPoint == null) {
|
||||
config.SSID = AccessPoint.convertToQuotedString(
|
||||
mSsid.getText().toString());
|
||||
mSsidView.getText().toString());
|
||||
// If the user adds a network manually, assume that it is hidden.
|
||||
config.hiddenSSID = true;
|
||||
} else if (mAccessPoint.networkId == -1) {
|
||||
@@ -186,10 +212,10 @@ public class WifiConfigController implements TextWatcher,
|
||||
config.networkId = mAccessPoint.networkId;
|
||||
}
|
||||
|
||||
switch (mSecurityType) {
|
||||
switch (mAccessPointSecurity) {
|
||||
case AccessPoint.SECURITY_NONE:
|
||||
config.allowedKeyManagement.set(KeyMgmt.NONE);
|
||||
return config;
|
||||
break;
|
||||
|
||||
case AccessPoint.SECURITY_WEP:
|
||||
config.allowedKeyManagement.set(KeyMgmt.NONE);
|
||||
@@ -206,7 +232,7 @@ public class WifiConfigController implements TextWatcher,
|
||||
config.wepKeys[0] = '"' + password + '"';
|
||||
}
|
||||
}
|
||||
return config;
|
||||
break;
|
||||
|
||||
case AccessPoint.SECURITY_PSK:
|
||||
config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
|
||||
@@ -218,38 +244,63 @@ public class WifiConfigController implements TextWatcher,
|
||||
config.preSharedKey = '"' + password + '"';
|
||||
}
|
||||
}
|
||||
return config;
|
||||
break;
|
||||
|
||||
case AccessPoint.SECURITY_EAP:
|
||||
config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
|
||||
config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
|
||||
config.eap.setValue((String) mEapMethod.getSelectedItem());
|
||||
config.eap.setValue((String) mEapMethodSpinner.getSelectedItem());
|
||||
|
||||
config.phase2.setValue((mPhase2.getSelectedItemPosition() == 0) ? "" :
|
||||
"auth=" + mPhase2.getSelectedItem());
|
||||
config.ca_cert.setValue((mEapCaCert.getSelectedItemPosition() == 0) ? "" :
|
||||
config.phase2.setValue((mPhase2Spinner.getSelectedItemPosition() == 0) ? "" :
|
||||
"auth=" + mPhase2Spinner.getSelectedItem());
|
||||
config.ca_cert.setValue((mEapCaCertSpinner.getSelectedItemPosition() == 0) ? "" :
|
||||
KEYSTORE_SPACE + Credentials.CA_CERTIFICATE +
|
||||
(String) mEapCaCert.getSelectedItem());
|
||||
config.client_cert.setValue((mEapUserCert.getSelectedItemPosition() == 0) ? "" :
|
||||
KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
|
||||
(String) mEapUserCert.getSelectedItem());
|
||||
config.private_key.setValue((mEapUserCert.getSelectedItemPosition() == 0) ? "" :
|
||||
KEYSTORE_SPACE + Credentials.USER_PRIVATE_KEY +
|
||||
(String) mEapUserCert.getSelectedItem());
|
||||
config.identity.setValue((mEapIdentity.length() == 0) ? "" :
|
||||
mEapIdentity.getText().toString());
|
||||
config.anonymous_identity.setValue((mEapAnonymous.length() == 0) ? "" :
|
||||
mEapAnonymous.getText().toString());
|
||||
(String) mEapCaCertSpinner.getSelectedItem());
|
||||
config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
|
||||
"" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
|
||||
(String) mEapUserCertSpinner.getSelectedItem());
|
||||
config.private_key.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
|
||||
"" : KEYSTORE_SPACE + Credentials.USER_PRIVATE_KEY +
|
||||
(String) mEapUserCertSpinner.getSelectedItem());
|
||||
config.identity.setValue((mEapIdentityView.length() == 0) ? "" :
|
||||
mEapIdentityView.getText().toString());
|
||||
config.anonymous_identity.setValue((mEapAnonymousView.length() == 0) ? "" :
|
||||
mEapAnonymousView.getText().toString());
|
||||
if (mPasswordView.length() != 0) {
|
||||
config.password.setValue(mPasswordView.getText().toString());
|
||||
}
|
||||
return config;
|
||||
break;
|
||||
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
|
||||
config.ipAssignment = mIpSettingsSpinner.getSelectedItem().toString().equals(STATIC_IP) ?
|
||||
IpAssignment.STATIC : IpAssignment.DHCP;
|
||||
|
||||
if (config.ipAssignment == IpAssignment.STATIC) {
|
||||
//TODO: A better way to do this is to not dismiss the
|
||||
//dialog as long as one of the fields is invalid
|
||||
try {
|
||||
config.ipConfig.ipAddress = stringToIpAddr(mIpAddressView.getText().toString());
|
||||
config.ipConfig.gateway = stringToIpAddr(mGatewayView.getText().toString());
|
||||
config.ipConfig.netmask = stringToIpAddr(mNetmaskView.getText().toString());
|
||||
config.ipConfig.dns1 = stringToIpAddr(mDns1View.getText().toString());
|
||||
if (mDns2View.getText() != null && mDns2View.getText().length() > 0) {
|
||||
config.ipConfig.dns2 = stringToIpAddr(mDns2View.getText().toString());
|
||||
}
|
||||
} catch (UnknownHostException e) {
|
||||
Toast.makeText(mConfigUi.getContext(), R.string.wifi_ip_settings_invalid_ip,
|
||||
Toast.LENGTH_LONG).show();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return config;
|
||||
}
|
||||
|
||||
private void showSecurityFields() {
|
||||
if (mSecurityType == AccessPoint.SECURITY_NONE) {
|
||||
if (mAccessPointSecurity == AccessPoint.SECURITY_NONE) {
|
||||
mView.findViewById(R.id.fields).setVisibility(View.GONE);
|
||||
return;
|
||||
}
|
||||
@@ -265,37 +316,75 @@ public class WifiConfigController implements TextWatcher,
|
||||
}
|
||||
}
|
||||
|
||||
if (mSecurityType != AccessPoint.SECURITY_EAP) {
|
||||
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP) {
|
||||
mView.findViewById(R.id.eap).setVisibility(View.GONE);
|
||||
return;
|
||||
}
|
||||
mView.findViewById(R.id.eap).setVisibility(View.VISIBLE);
|
||||
|
||||
if (mEapMethod == null) {
|
||||
mEapMethod = (Spinner) mView.findViewById(R.id.method);
|
||||
mPhase2 = (Spinner) mView.findViewById(R.id.phase2);
|
||||
mEapCaCert = (Spinner) mView.findViewById(R.id.ca_cert);
|
||||
mEapUserCert = (Spinner) mView.findViewById(R.id.user_cert);
|
||||
mEapIdentity = (TextView) mView.findViewById(R.id.identity);
|
||||
mEapAnonymous = (TextView) mView.findViewById(R.id.anonymous);
|
||||
if (mEapMethodSpinner == null) {
|
||||
mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
|
||||
mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
|
||||
mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
|
||||
mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert);
|
||||
mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
|
||||
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
|
||||
|
||||
loadCertificates(mEapCaCert, Credentials.CA_CERTIFICATE);
|
||||
loadCertificates(mEapUserCert, Credentials.USER_PRIVATE_KEY);
|
||||
loadCertificates(mEapCaCertSpinner, Credentials.CA_CERTIFICATE);
|
||||
loadCertificates(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY);
|
||||
|
||||
if (mAccessPoint != null && mAccessPoint.networkId != -1) {
|
||||
WifiConfiguration config = mAccessPoint.getConfig();
|
||||
setSelection(mEapMethod, config.eap.value());
|
||||
setSelection(mPhase2, config.phase2.value());
|
||||
setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE,
|
||||
setSelection(mEapMethodSpinner, config.eap.value());
|
||||
setSelection(mPhase2Spinner, config.phase2.value());
|
||||
setCertificate(mEapCaCertSpinner, Credentials.CA_CERTIFICATE,
|
||||
config.ca_cert.value());
|
||||
setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY,
|
||||
setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY,
|
||||
config.private_key.value());
|
||||
mEapIdentity.setText(config.identity.value());
|
||||
mEapAnonymous.setText(config.anonymous_identity.value());
|
||||
mEapIdentityView.setText(config.identity.value());
|
||||
mEapAnonymousView.setText(config.anonymous_identity.value());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void showIpConfigFields() {
|
||||
WifiConfiguration config = null;
|
||||
|
||||
mView.findViewById(R.id.ipfields).setVisibility(View.VISIBLE);
|
||||
|
||||
if (mIpSettingsSpinner == null) {
|
||||
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ipsettings);
|
||||
}
|
||||
|
||||
if (mAccessPoint != null && mAccessPoint.networkId != -1) {
|
||||
config = mAccessPoint.getConfig();
|
||||
}
|
||||
|
||||
if (mIpSettingsSpinner.getSelectedItem().equals(STATIC_IP)) {
|
||||
mView.findViewById(R.id.staticip).setVisibility(View.VISIBLE);
|
||||
if (mIpAddressView == null) {
|
||||
mIpAddressView = (TextView) mView.findViewById(R.id.ipaddress);
|
||||
mGatewayView = (TextView) mView.findViewById(R.id.gateway);
|
||||
mNetmaskView = (TextView) mView.findViewById(R.id.netmask);
|
||||
mDns1View = (TextView) mView.findViewById(R.id.dns1);
|
||||
mDns2View = (TextView) mView.findViewById(R.id.dns2);
|
||||
}
|
||||
if (config != null) {
|
||||
DhcpInfo ipConfig = config.ipConfig;
|
||||
if (ipConfig != null && ipConfig.ipAddress != 0) {
|
||||
mIpAddressView.setText(intToIpString(ipConfig.ipAddress));
|
||||
mGatewayView.setText(intToIpString(ipConfig.gateway));
|
||||
mNetmaskView.setText(intToIpString(ipConfig.netmask));
|
||||
mDns1View.setText(intToIpString(ipConfig.dns1));
|
||||
mDns2View.setText(intToIpString(ipConfig.dns2));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
mView.findViewById(R.id.staticip).setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void loadCertificates(Spinner spinner, String prefix) {
|
||||
final Context context = mConfigUi.getContext();
|
||||
final String unspecified = context.getString(R.string.wifi_unspecified);
|
||||
@@ -358,12 +447,41 @@ public class WifiConfigController implements TextWatcher,
|
||||
|
||||
@Override
|
||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
||||
mSecurityType = position;
|
||||
showSecurityFields();
|
||||
enableSubmitIfAppropriate();
|
||||
if (view == mSecuritySpinner) {
|
||||
mAccessPointSecurity = position;
|
||||
showSecurityFields();
|
||||
enableSubmitIfAppropriate();
|
||||
} else {
|
||||
showIpConfigFields();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNothingSelected(AdapterView<?> parent) {
|
||||
}
|
||||
|
||||
/* TODO: should go away when we move to IPv6 based config storage */
|
||||
private static int stringToIpAddr(String addrString) throws UnknownHostException {
|
||||
try {
|
||||
String[] parts = addrString.split("\\.");
|
||||
if (parts.length != 4) {
|
||||
throw new UnknownHostException(addrString);
|
||||
}
|
||||
|
||||
int a = Integer.parseInt(parts[0]);
|
||||
int b = Integer.parseInt(parts[1]) << 8;
|
||||
int c = Integer.parseInt(parts[2]) << 16;
|
||||
int d = Integer.parseInt(parts[3]) << 24;
|
||||
|
||||
return a | b | c | d;
|
||||
} catch (NumberFormatException e) {
|
||||
throw new UnknownHostException(addrString);
|
||||
}
|
||||
}
|
||||
|
||||
private static String intToIpString(int i) {
|
||||
return (i & 0xFF) + "." + ((i >> 8 ) & 0xFF) + "." +((i >> 16 ) & 0xFF) + "." +
|
||||
((i >> 24 ) & 0xFF);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user