<TextView
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"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:prompt="@string/please_select_phase2"
+ android:entries="@array/wifi_phase2_entries" />
+
+ <TextView
+ style="?android:attr/textAppearanceSmallInverse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
<string name="wifi_speed" msgid="3526198708812322037">"Rychlost připojení"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Adresa IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Ověření Phase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certifikát CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certifikát uživatele"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Linkhastighed"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-godkendelse"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Brugercertifikat"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Verbindungsgeschwindigkeit"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP-Adresse"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP-Methode"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-Authentifizierung"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-Zertifikat"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Nutzerzertifikat"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Ταχύτητα σύνδεσης"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Διεύθυνση IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Μέθοδος EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"2η φάση ελέγχου ταυτότητας"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Πιστοποιητικό CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Πιστοποιητικό χρήστη"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ταυτότητα"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Velocidad del vínculo"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Método de EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado del usuario"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Velocidad de enlace"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado de usuario"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Vitesse de connexion"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Adresse IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Méthode EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Authentification phase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificat utilisateur"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Velocità di collegamento"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Indirizzo IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Metodo EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Autenticazione fase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificato CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificato utente"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string>
<string name="wifi_speed" msgid="3526198708812322037">"リンク速度"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IPアドレス"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP方式"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"フェーズ2認証"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA証明書"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"ユーザー証明書"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
<string name="wifi_speed" msgid="3526198708812322037">"링크 속도"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP 주소"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP 방식"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"단계 2 인증"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 인증서"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"사용자 인증서"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Koblingshastighet"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-autentisering"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-sertifikat"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Klientsertifikat"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Linksnelheid"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP-adres"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP-methode"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-verificatie"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certificaat"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Gebruikerscertificaat"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Szybkość łącza"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Adres IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Uwierzytelnianie Phase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certyfikat urzędu certyfikacji"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certyfikat użytkownika"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Velocidade da ligação"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"método EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da fase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado do utilizador"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Velocidade do link"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da Fase 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado do usuário"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP-адрес"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"Метод EAP"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"2-й этап аутентификации"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Сертификат центра сертификации"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Сертификат пользователя"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Пользователь"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Länkhastighet"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP-adress"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metod"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Autentisering för fas 2"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Användarcertifikat"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_speed" msgid="3526198708812322037">"Bağlantı hızı"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP adresi"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP yöntemi"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"Aşama 2 için kimlik doğrulaması"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA sertifikası"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Kullanıcı sertifikası"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string>
<string name="wifi_speed" msgid="3526198708812322037">"连接速度"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP 地址"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"阶段 2 身份验证"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 证书"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"用户证书"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"身份"</string>
<string name="wifi_speed" msgid="3526198708812322037">"連線速度"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"IP 位址"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
+ <string name="please_select_phase2" msgid="5231074529772044898">"階段 2 驗證"</string>
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 憑證"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"使用者憑證"</string>
<string name="wifi_eap_identity" msgid="4359453783379679103">"識別"</string>
<string name="wifi_ip_address">IP address</string>
<!-- Label for the EAP method of the network -->
<string name="wifi_eap_method">EAP method</string>
+ <!-- Label for the phase2 -->
+ <string name="please_select_phase2">Phase 2 authentication</string>
<!-- Label for the EAP CA certificate of the network -->
<string name="wifi_eap_ca_cert">CA certificate</string>
<!-- Label for the EAP user certificate of the network -->
private Spinner mEapMethod;
private Spinner mEapCaCert;
+ private Spinner mPhase2;
private Spinner mEapUserCert;
private TextView mEapIdentity;
private TextView mEapAnonymous;
config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
config.eap.setValue((String) mEapMethod.getSelectedItem());
+
+ config.phase2.setValue((mPhase2.getSelectedItemPosition() == 0) ? "" :
+ "auth=" + mPhase2.getSelectedItem());
config.ca_cert.setValue((mEapCaCert.getSelectedItemPosition() == 0) ? "" :
KEYSTORE_SPACE + Credentials.CA_CERTIFICATE +
(String) mEapCaCert.getSelectedItem());
if (mEapMethod == null) {
mEapMethod = (Spinner) mView.findViewById(R.id.method);
+ mPhase2 = (Spinner) mView.findViewById(R.id.phase2);
mEapCaCert = (Spinner) mView.findViewById(R.id.ca_cert);
mEapUserCert = (Spinner) mView.findViewById(R.id.user_cert);
mEapIdentity = (TextView) mView.findViewById(R.id.identity);
if (mAccessPoint != null && mAccessPoint.networkId != -1) {
WifiConfiguration config = mAccessPoint.getConfig();
setSelection(mEapMethod, config.eap.value());
+ setSelection(mPhase2, config.phase2.value());
setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE,
config.ca_cert.value());
setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY,