Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initialize Anonymous identity field for TTLS and PEAP EAP methods"

Browse Source
This commit is contained in:
Weng Su
2023-02-09 02:23:13 +00:00
committed by Android (Google) Code Review
parent bd9fa42d84 a346f5b5e2
commit 0085bb7052
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,8 @@ public class WifiConfigController2 implements TextWatcher,
AdapterView.OnItemSelectedListener, OnCheckedChangeListener,
TextView.OnEditorActionListener, View.OnKeyListener {
private static final String TAG = "WifiConfigController2";
@VisibleForTesting
static final String DEFAULT_ANONYMOUS_ID = "anonymous";
private static final String SYSTEM_CA_STORE_PATH = "/system/etc/security/cacerts";
@@ -187,7 +189,8 @@ public class WifiConfigController2 implements TextWatcher,
private ArrayAdapter<CharSequence> mPhase2Adapter;
private Spinner mEapUserCertSpinner;
private TextView mEapIdentityView;
private TextView mEapAnonymousView;
@VisibleForTesting
TextView mEapAnonymousView;
private Spinner mIpSettingsSpinner;
private TextView mIpAddressView;
@@ -1256,7 +1259,7 @@ public class WifiConfigController2 implements TextWatcher,
mPhase2Spinner.setAdapter(mPhase2Adapter);
}
mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
setAnonymousIdVisible();
showPeapFields();
setUserCertInvisible();
break;
@@ -1267,7 +1270,7 @@ public class WifiConfigController2 implements TextWatcher,
mPhase2Spinner.setAdapter(mPhase2Adapter);
}
mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
setAnonymousIdVisible();
setUserCertInvisible();
mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
break;
@@ -1313,7 +1316,6 @@ public class WifiConfigController2 implements TextWatcher,
mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
} else {
mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
@@ -1358,6 +1360,12 @@ public class WifiConfigController2 implements TextWatcher,
mEapAnonymousView.setText("");
}
@VisibleForTesting
void setAnonymousIdVisible() {
mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
mEapAnonymousView.setText(DEFAULT_ANONYMOUS_ID);
}
private void setPasswordInvisible() {
mPasswordView.setText("");
mView.findViewById(R.id.password_layout).setVisibility(View.GONE);