WifiSettings: revise and add support for editing EAP networks.
Use arrays.xml to store translations for enumerations; avoid race conditions happened when pop up menu or dialog; avoid saving configurations with networks disabled; use the same layout for all the dialogs; support editing EAP networks; only unlock keystore before connecting; and many bug fixes I cannot remember. The number of lines in the new code is about 1/3 of the old one, and it improves the readability a lot!
This commit is contained in:
Chia-chi Yeh
362
src/com/android/settings/wifi/WifiDialog.java
Normal file
362
src/com/android/settings/wifi/WifiDialog.java
Normal file
@@ -0,0 +1,362 @@
|
||||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.wifi;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.res.Resources;
|
||||
import android.net.NetworkInfo.DetailedState;
|
||||
import android.net.wifi.WifiConfiguration;
|
||||
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
|
||||
import android.net.wifi.WifiConfiguration.KeyMgmt;
|
||||
import android.net.wifi.WifiInfo;
|
||||
import android.os.Bundle;
|
||||
import android.security.Credentials;
|
||||
import android.security.KeyStore;
|
||||
import android.text.Editable;
|
||||
import android.text.InputType;
|
||||
import android.text.TextWatcher;
|
||||
import android.text.format.Formatter;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.Spinner;
|
||||
import android.widget.TextView;
|
||||
|
||||
class WifiDialog extends AlertDialog implements View.OnClickListener,
|
||||
TextWatcher, AdapterView.OnItemSelectedListener {
|
||||
private static final String KEYSTORE_SPACE = "keystore://";
|
||||
|
||||
static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
|
||||
static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;
|
||||
|
||||
final boolean edit;
|
||||
private final DialogInterface.OnClickListener mListener;
|
||||
private final AccessPoint mAccessPoint;
|
||||
|
||||
private View mView;
|
||||
private TextView mSsid;
|
||||
private int mSecurity;
|
||||
private TextView mPassword;
|
||||
|
||||
private Spinner mEapMethod;
|
||||
private Spinner mEapCaCert;
|
||||
private Spinner mEapUserCert;
|
||||
private TextView mEapIdentity;
|
||||
private TextView mEapAnonymous;
|
||||
|
||||
static boolean requireKeyStore(WifiConfiguration config) {
|
||||
String values[] = {config.ca_cert.value(), config.client_cert.value(),
|
||||
config.private_key.value()};
|
||||
for (String value : values) {
|
||||
if (value != null && value.startsWith(KEYSTORE_SPACE)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
WifiDialog(Context context, DialogInterface.OnClickListener listener,
|
||||
AccessPoint accessPoint, boolean edit) {
|
||||
super(context);
|
||||
this.edit = edit;
|
||||
mListener = listener;
|
||||
mAccessPoint = accessPoint;
|
||||
mSecurity = (accessPoint == null) ? AccessPoint.SECURITY_NONE : accessPoint.security;
|
||||
}
|
||||
|
||||
WifiConfiguration getConfig() {
|
||||
if (mAccessPoint != null && mAccessPoint.networkId != -1 && !edit) {
|
||||
return null;
|
||||
}
|
||||
|
||||
WifiConfiguration config = new WifiConfiguration();
|
||||
|
||||
if (mAccessPoint == null) {
|
||||
config.SSID = mSsid.getText().toString();
|
||||
// If the user adds a network manually, assume that it is hidden.
|
||||
config.hiddenSSID = true;
|
||||
} else if (mAccessPoint.networkId == -1) {
|
||||
config.SSID = mAccessPoint.ssid;
|
||||
} else {
|
||||
config.networkId = mAccessPoint.networkId;
|
||||
}
|
||||
|
||||
switch (mSecurity) {
|
||||
case AccessPoint.SECURITY_NONE:
|
||||
config.allowedKeyManagement.set(KeyMgmt.NONE);
|
||||
return config;
|
||||
|
||||
case AccessPoint.SECURITY_WEP:
|
||||
config.allowedKeyManagement.set(KeyMgmt.NONE);
|
||||
config.allowedAuthAlgorithms.set(AuthAlgorithm.SHARED);
|
||||
if (mPassword.length() != 0) {
|
||||
int length = mPassword.length();
|
||||
String password = mPassword.getText().toString();
|
||||
// WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
|
||||
if ((length == 10 || length == 26 || length == 58) &&
|
||||
password.matches("[0-9A-Fa-f]*")) {
|
||||
config.wepKeys[0] = password;
|
||||
} else {
|
||||
config.wepKeys[0] = '"' + password + '"';
|
||||
}
|
||||
}
|
||||
return config;
|
||||
|
||||
case AccessPoint.SECURITY_PSK:
|
||||
config.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
|
||||
config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
|
||||
if (mPassword.length() != 0) {
|
||||
String password = mPassword.getText().toString();
|
||||
if (password.matches("[0-9A-Fa-f]{64}")) {
|
||||
config.preSharedKey = password;
|
||||
} else {
|
||||
config.preSharedKey = '"' + password + '"';
|
||||
}
|
||||
}
|
||||
return config;
|
||||
|
||||
case AccessPoint.SECURITY_EAP:
|
||||
config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
|
||||
config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
|
||||
config.eap.setValue((String) mEapMethod.getSelectedItem());
|
||||
config.ca_cert.setValue((mEapCaCert.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.PRIVATE_KEY +
|
||||
(String) mEapUserCert.getSelectedItem());
|
||||
config.identity.setValue((mEapIdentity.length() == 0) ? "" :
|
||||
mEapIdentity.getText().toString());
|
||||
config.anonymous_identity.setValue((mEapAnonymous.length() == 0) ? "" :
|
||||
mEapAnonymous.getText().toString());
|
||||
if (mPassword.length() != 0) {
|
||||
config.password.setValue(mPassword.getText().toString());
|
||||
}
|
||||
return config;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
mView = getLayoutInflater().inflate(R.layout.wifi_dialog, null);
|
||||
setView(mView);
|
||||
setInverseBackgroundForced(true);
|
||||
|
||||
Context context = getContext();
|
||||
Resources resources = context.getResources();
|
||||
|
||||
if (mAccessPoint == null) {
|
||||
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);
|
||||
setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_save), mListener);
|
||||
} else {
|
||||
setTitle(mAccessPoint.ssid);
|
||||
ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
|
||||
|
||||
DetailedState state = mAccessPoint.getState();
|
||||
if (state != null) {
|
||||
addRow(group, R.string.wifi_status, Summary.get(getContext(), state));
|
||||
}
|
||||
|
||||
String[] type = resources.getStringArray(R.array.wifi_security);
|
||||
addRow(group, R.string.wifi_security, type[mAccessPoint.security]);
|
||||
|
||||
int level = mAccessPoint.getLevel();
|
||||
if (level != -1) {
|
||||
String[] signal = resources.getStringArray(R.array.wifi_signal);
|
||||
addRow(group, R.string.wifi_signal, signal[level]);
|
||||
}
|
||||
|
||||
WifiInfo info = mAccessPoint.getInfo();
|
||||
if (info != null) {
|
||||
addRow(group, R.string.wifi_speed, info.getLinkSpeed() + WifiInfo.LINK_SPEED_UNITS);
|
||||
// TODO: fix the ip address for IPv6.
|
||||
int address = info.getIpAddress();
|
||||
if (address != 0) {
|
||||
addRow(group, R.string.wifi_ip_address, Formatter.formatIpAddress(address));
|
||||
}
|
||||
}
|
||||
|
||||
if (mAccessPoint.networkId == -1 || edit) {
|
||||
showSecurityFields();
|
||||
}
|
||||
|
||||
if (edit) {
|
||||
setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_save), mListener);
|
||||
} else {
|
||||
if (state == null && level != -1) {
|
||||
setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_connect), mListener);
|
||||
}
|
||||
if (mAccessPoint.networkId != -1) {
|
||||
setButton(BUTTON_FORGET, context.getString(R.string.wifi_forget), mListener);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
setButton(DialogInterface.BUTTON_NEGATIVE,
|
||||
context.getString(R.string.wifi_cancel), mListener);
|
||||
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (getButton(BUTTON_SUBMIT) != null) {
|
||||
validate();
|
||||
}
|
||||
}
|
||||
|
||||
private void addRow(ViewGroup group, int name, String value) {
|
||||
View row = getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
|
||||
((TextView) row.findViewById(R.id.name)).setText(name);
|
||||
((TextView) row.findViewById(R.id.value)).setText(value);
|
||||
group.addView(row);
|
||||
}
|
||||
|
||||
private void validate() {
|
||||
// TODO: make sure this is complete.
|
||||
if ((mSsid != null && mSsid.length() == 0) ||
|
||||
((mAccessPoint == null || mAccessPoint.networkId == -1) &&
|
||||
((mSecurity == AccessPoint.SECURITY_WEP && mPassword.length() == 0) ||
|
||||
(mSecurity == AccessPoint.SECURITY_PSK && mPassword.length() < 8)))) {
|
||||
getButton(BUTTON_SUBMIT).setEnabled(false);
|
||||
} else {
|
||||
getButton(BUTTON_SUBMIT).setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
public void onClick(View view) {
|
||||
mPassword.setInputType(
|
||||
InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
|
||||
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
|
||||
InputType.TYPE_TEXT_VARIATION_PASSWORD));
|
||||
}
|
||||
|
||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
||||
}
|
||||
|
||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
||||
}
|
||||
|
||||
public void afterTextChanged(Editable editable) {
|
||||
validate();
|
||||
}
|
||||
|
||||
public void onItemSelected(AdapterView parent, View view, int position, long id) {
|
||||
mSecurity = position;
|
||||
showSecurityFields();
|
||||
validate();
|
||||
}
|
||||
|
||||
public void onNothingSelected(AdapterView parent) {
|
||||
}
|
||||
|
||||
private void showSecurityFields() {
|
||||
if (mSecurity == AccessPoint.SECURITY_NONE) {
|
||||
mView.findViewById(R.id.fields).setVisibility(View.GONE);
|
||||
return;
|
||||
}
|
||||
mView.findViewById(R.id.fields).setVisibility(View.VISIBLE);
|
||||
|
||||
if (mPassword == null) {
|
||||
mPassword = (TextView) mView.findViewById(R.id.password);
|
||||
mPassword.addTextChangedListener(this);
|
||||
((CheckBox) mView.findViewById(R.id.show_password)).setOnClickListener(this);
|
||||
|
||||
if (mAccessPoint != null && mAccessPoint.networkId != -1) {
|
||||
mPassword.setHint(R.string.wifi_unchanged);
|
||||
}
|
||||
}
|
||||
|
||||
if (mSecurity != 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);
|
||||
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);
|
||||
|
||||
loadCertificates(mEapCaCert, Credentials.CA_CERTIFICATE);
|
||||
loadCertificates(mEapUserCert, Credentials.USER_PRIVATE_KEY);
|
||||
|
||||
if (mAccessPoint != null && mAccessPoint.networkId != -1) {
|
||||
WifiConfiguration config = mAccessPoint.getConfig();
|
||||
setSelection(mEapMethod, config.eap.value());
|
||||
setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE,
|
||||
config.ca_cert.value());
|
||||
setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY,
|
||||
config.private_key.value());
|
||||
mEapIdentity.setText(config.identity.value());
|
||||
mEapAnonymous.setText(config.anonymous_identity.value());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void loadCertificates(Spinner spinner, String prefix) {
|
||||
String[] certs = KeyStore.getInstance().saw(prefix);
|
||||
Context context = getContext();
|
||||
String unspecified = context.getString(R.string.wifi_unspecified);
|
||||
|
||||
if (certs == null || certs.length == 0) {
|
||||
certs = new String[] {unspecified};
|
||||
} else {
|
||||
String[] array = new String[certs.length + 1];
|
||||
array[0] = unspecified;
|
||||
System.arraycopy(certs, 0, array, 1, certs.length);
|
||||
certs = array;
|
||||
}
|
||||
|
||||
ArrayAdapter<String> adapter = new ArrayAdapter<String>(
|
||||
context, android.R.layout.simple_spinner_item, certs);
|
||||
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||
spinner.setAdapter(adapter);
|
||||
}
|
||||
|
||||
private void setCertificate(Spinner spinner, String prefix, String cert) {
|
||||
prefix = KEYSTORE_SPACE + prefix;
|
||||
if (cert != null && cert.startsWith(prefix)) {
|
||||
setSelection(spinner, cert.substring(prefix.length()));
|
||||
}
|
||||
}
|
||||
|
||||
private void setSelection(Spinner spinner, String value) {
|
||||
if (value != null) {
|
||||
ArrayAdapter<String> adapter = (ArrayAdapter<String>) spinner.getAdapter();
|
||||
for (int i = adapter.getCount() - 1; i >= 0; --i) {
|
||||
if (value.equals(adapter.getItem(i))) {
|
||||
spinner.setSelection(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user