PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Wi-Fi] Revert "support SAE password identifier in wifi dialog""

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-10 08:31:39 +00:00
committed by Android (Google) Code Review
parent 76a41a84dd a6ec144392
commit e9f52bce9d
4 changed files with 0 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -142,7 +142,6 @@ public class WifiConfigController implements TextWatcher,
@VisibleForTesting
int mAccessPointSecurity;
private TextView mPasswordView;
private TextView mSaePasswordIdView;
private ImageButton mSsidScanButton;
private String mUnspecifiedCertString;
@@ -811,11 +810,6 @@ public class WifiConfigController implements TextWatcher,
String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"';
}
if (mSaePasswordIdView.length() != 0) {
config.saePasswordId = mSaePasswordIdView.getText().toString();
} else {
config.saePasswordId = null;
}
break;
case AccessPoint.SECURITY_OWE:
@@ -1002,23 +996,6 @@ public class WifiConfigController implements TextWatcher,
}
}
if (mSaePasswordIdView == null) {
mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
mSaePasswordIdView.setOnEditorActionListener(this);
mSaePasswordIdView.setOnKeyListener(this);
}
if (mAccessPointSecurity == AccessPoint.SECURITY_SAE) {
mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
if (mAccessPoint != null && mAccessPoint.isSaved()) {
if (!TextUtils.isEmpty(mAccessPoint.getConfig().saePasswordId)) {
mSaePasswordIdView.setText(mAccessPoint.getConfig().saePasswordId);
}
}
} else {
setSaePasswordIdInvisible();
}
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP &&
mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -1326,11 +1303,6 @@ public class WifiConfigController implements TextWatcher,
mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
}
private void setSaePasswordIdInvisible() {
mSaePasswordIdView.setText("");
mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
}
private void setEapMethodInvisible() {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
}

28
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -142,7 +142,6 @@ public class WifiConfigController2 implements TextWatcher,
@VisibleForTesting
int mWifiEntrySecurity;
private TextView mPasswordView;
private TextView mSaePasswordIdView;
private ImageButton mSsidScanButton;
private String mUnspecifiedCertString;
@@ -805,11 +804,6 @@ public class WifiConfigController2 implements TextWatcher,
String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"';
}
if (mSaePasswordIdView.length() != 0) {
config.saePasswordId = mSaePasswordIdView.getText().toString();
} else {
config.saePasswordId = null;
}
break;
case WifiEntry.SECURITY_OWE:
@@ -996,23 +990,6 @@ public class WifiConfigController2 implements TextWatcher,
}
}
if (mSaePasswordIdView == null) {
mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
mSaePasswordIdView.setOnEditorActionListener(this);
mSaePasswordIdView.setOnKeyListener(this);
}
if (mWifiEntrySecurity == WifiEntry.SECURITY_SAE) {
mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
if (mWifiEntry != null && mWifiEntry.isSaved()) {
if (!TextUtils.isEmpty(mWifiEntry.getWifiConfiguration().saePasswordId)) {
mSaePasswordIdView.setText(mWifiEntry.getWifiConfiguration().saePasswordId);
}
}
} else {
setSaePasswordIdInvisible();
}
if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP
&& mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -1322,11 +1299,6 @@ public class WifiConfigController2 implements TextWatcher,
mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
}
private void setSaePasswordIdInvisible() {
mSaePasswordIdView.setText("");
mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
}
private void setEapMethodInvisible() {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
}