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

Add EAP/802.1X configuration for WiFi Setting.

Browse Source 
1. Remove the isEnterprise() filter in Scanresult.
2. This requires the new fields such as identity, eap, certificate/key
to support EAP authentication in Wifi Settings.
3. Add simple file-based keystore to select the cert/key from UI.

-- Updated from the comments.
-- Fix the bug for passing null pointer for adding spinner items.
This commit is contained in:
Chung-yih Wang
2009-06-03 19:44:35 +08:00
parent 03a6110b4f
commit 0c1f89857a
7 changed files with 598 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
res/layout/wifi_ap_configure.xml
View File

@@ -24,11 +24,17 @@
android:padding="8dip"
android:orientation="vertical">
<LinearLayout
android:id="@+id/table"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
</LinearLayout>
<!-- SSID -->
<TextView
<TextView android:id="@+id/ssid_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -44,7 +50,7 @@
<!-- Security -->
<TextView
<TextView android:id="@+id/security_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -55,9 +61,94 @@
<Spinner android:id="@+id/security_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<!-- Enterprise Fields -->
<LinearLayout android:id="@+id/enterprise_wrapper"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="8dip"
android:orientation="vertical">
<TextView android:id="@+id/eap_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_eap" />
<Spinner android:id="@+id/eap_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/phase2_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_phase2" />
<Spinner android:id="@+id/phase2_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/identity_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_identity" />
<EditText android:id="@+id/identity_edit"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true" />
<TextView android:id="@+id/anonymous_identity_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_anonymous_identity" />
<EditText android:id="@+id/anonymous_identity_edit"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true" />
<TextView android:id="@+id/client_certificate_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_client_certificate" />
<Spinner android:id="@+id/client_certificate_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/ca_certificate_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_ca_certificate" />
<Spinner android:id="@+id/ca_certificate_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/private_key_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_select_private_key" />
<Spinner android:id="@+id/private_key_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView android:id="@+id/private_key_passwd_text"
style="?android:attr/textAppearanceSmallInverse"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/please_type_private_key_passwd" />
<EditText android:id="@+id/private_key_passwd_edit"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dip"
android:singleLine="true" />
</LinearLayout>
<!-- Password -->
<TextView android:id="@+id/password_text"