Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d79363fe authored by Jimmy Chen's avatar Jimmy Chen
Browse files

wifi: support SAE password identifier in wifi dialog 

Bug: 138305265
Test: atest FrameworksWifiApiTests
Test: atest FrameworksWifiTests
Test: connect to a WPA3 SAE access point with different
      password/identifer combinations.

Change-Id: Idf1f82faaafa9c5f2212a0fa1dcc2eec53a9dbd5
parent a520e36d

res/layout/wifi_dialog.xml

+19 −0
Original line number Diff line number Diff line
@@ -311,6 +311,25 @@ 
                        style="@style/wifi_item_content"

                        android:text="@string/wifi_show_password" />

            </LinearLayout>



            <LinearLayout android:id="@+id/sae_password_id_layout"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item"

                    android:visibility="gone">

                <TextView

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        style="@style/wifi_item_label"

                        android:text="@string/wifi_sae_password_id" />



                <EditText android:id="@+id/sae_password_id"

                          android:layout_width="match_parent"

                          android:layout_height="wrap_content"

                          style="@style/wifi_item_edit_content"

                          android:singleLine="true"

                          android:inputType="textNoSuggestions" />

            </LinearLayout>

        </LinearLayout>



        <LinearLayout android:id="@+id/wifi_advanced_toggle"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2143,6 +2143,8 @@ 
    <string name="wifi_eap_anonymous">Anonymous identity</string>

    <!-- Label for the password of the secured network -->

    <string name="wifi_password">Password</string>

    <!-- Label for the sae password id of the secured network [CHAR LIMIT=32] -->

    <string name="wifi_sae_password_id">SAE password identifier</string>

    <!-- Label for the check box to show password -->

    <string name="wifi_show_password">Show password</string>

    <!-- Label for the RadioGroup to choose wifi ap band -->

src/com/android/settings/wifi/WifiConfigController.java

+28 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ public class WifiConfigController implements TextWatcher, 
    @VisibleForTesting

    int mAccessPointSecurity;

    private TextView mPasswordView;

    private TextView mSaePasswordIdView;

    private ImageButton mSsidScanButton;



    private String mUnspecifiedCertString;
@@ -786,6 +787,11 @@ 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:
@@ -968,6 +974,23 @@ 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);
@@ -1249,6 +1272,11 @@ 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);

    }