No public description

PiperOrigin-RevId: 643344987

Author: jscott1989

src/main/java/com/afwsamples/testdpc/policy/wifimanagement/WifiEapTlsCreateDialogFragment.java

@@ -60,6 +60,8 @@ public class WifiEapTlsCreateDialogFragment extends DialogFragment {
   private TextView mUserCertTextView;
   private EditText mCertPasswordEditText;
   private EditText mIdentityEditText;
+  private EditText mDomainEditText;
+  private EditText mAltSubjectMatchEditText;
 
   public static WifiEapTlsCreateDialogFragment newInstance(WifiConfiguration config) {
     Bundle arguments = new Bundle();
@@ -105,6 +107,11 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
     mSsidEditText = (EditText) rootView.findViewById(R.id.ssid);
     mCertPasswordEditText = (EditText) rootView.findViewById(R.id.wifi_client_cert_password);
     mIdentityEditText = (EditText) rootView.findViewById(R.id.wifi_identity);
+    mDomainEditText = (EditText) rootView.findViewById(R.id.wifi_domain);
+    mAltSubjectMatchEditText = (EditText) rootView.findViewById(R.id.wifi_alt_subject_match);
+    // These config options are not available before API 23
+    mDomainEditText.setEnabled(SDK_INT >= VERSION_CODES.M);
+    mAltSubjectMatchEditText.setEnabled(SDK_INT >= VERSION_CODES.M);
     populateUi();
     final AlertDialog dialog =
         new AlertDialog.Builder(getActivity())
@@ -165,6 +172,10 @@ private void populateUi() {
     // Both ca cert and client are not populated in the WifiConfiguration object.
     updateSelectedCert(mCaCertTextView, null, null);
     updateSelectedCert(mUserCertTextView, null, null);
+    if (SDK_INT >= VERSION_CODES.M) {
+      mDomainEditText.setText(mWifiConfiguration.enterpriseConfig.getDomainSuffixMatch());
+      mAltSubjectMatchEditText.setText(mWifiConfiguration.enterpriseConfig.getAltSubjectMatch());
+    }
   }
 
   private boolean extractInputDataAndSave() {
@@ -204,11 +215,30 @@ private WifiEnterpriseConfig extractEnterpriseConfig() {
     WifiEnterpriseConfig config = new WifiEnterpriseConfig();
     config.setEapMethod(WifiEnterpriseConfig.Eap.TLS);
     String identity = mIdentityEditText.getText().toString();
+    String domain = mDomainEditText.getText().toString();
+    String altSubjectMatch = mAltSubjectMatchEditText.getText().toString();
 
     if (!TextUtils.isEmpty(identity)) {
       config.setIdentity(identity);
     }
 
+    if (SDK_INT >= VERSION_CODES.S
+        && TextUtils.isEmpty(domain)
+        && TextUtils.isEmpty(altSubjectMatch)) {
+      showToast(R.string.error_domain_and_alt_subject_match_both_unset);
+      return null;
+    }
+
+    if (SDK_INT >= VERSION_CODES.M) {
+      if (!TextUtils.isEmpty(domain)) {
+        config.setDomainSuffixMatch(domain);
+      }
+
+      if (!TextUtils.isEmpty(altSubjectMatch)) {
+        config.setAltSubjectMatch(altSubjectMatch);
+      }
+    }
+
     if (mCaCertUri == null) {
       showToast(R.string.error_missing_ca_cert);
       return null;

src/main/res/layout/eap_tls_wifi_config_dialog.xml

@@ -123,5 +123,39 @@
                     android:layout_height="wrap_content"
                 tools:ignore="TextFields" />
         </LinearLayout>
+
+        <LinearLayout
+                style="@style/networking_item"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            <TextView
+                    style="@style/networking_item_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/wifi_domain"/>
+            <EditText
+                    android:id="@+id/wifi_domain"
+                    style="@style/networking_item_edit_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                tools:ignore="TextFields" />
+        </LinearLayout>
+
+        <LinearLayout
+                style="@style/networking_item"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            <TextView
+                    style="@style/networking_item_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/wifi_alt_subject_match"/>
+            <EditText
+                    android:id="@+id/wifi_alt_subject_match"
+                    style="@style/networking_item_edit_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                tools:ignore="TextFields" />
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>

src/main/res/values/strings.xml

@@ -361,12 +361,15 @@
     <string name="create_eap_tls_wifi_configuration">Create EAP-TLS WI-FI configuration</string>
     <string name="wifi_identity">Identity (if any)</string>
     <string name="wifi_client_cert_password">Client certificate password (if any)</string>
+    <string name="wifi_domain">Domain suffix match</string>
+    <string name="wifi_alt_subject_match">Alt subject match</string>
     <string name="import_ca_certificate">Import CA certificate</string>
     <string name="import_user_certificate">Import user certificate</string>
     <string name="select_user_certificate">Select user certificate</string>
     <string name="selected_certificate">Selected certificate: <xliff:g example="server certificate" id="certificate_alias">%1$s</xliff:g></string>
     <string name="selected_keychain_certificate">Selected KeyChain alias: <xliff:g example="somealias" id="certificate_alias">%1$s</xliff:g></string>
     <string name="selected_certificate_none">No certificate selected</string>
+    <string name="error_domain_and_alt_subject_match_both_unset">Either domain or alt subject match must be set</string>
     <string name="error_missing_ssid">Missing SSID</string>
     <string name="error_missing_ca_cert">Missing CA cert</string>
     <string name="error_missing_client_cert">Missing client cert or invalid cert password</string>