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

Merge change 6328 into donut

Browse Source 
* changes:
  String fixes for the credential storage and vpn settings.
This commit is contained in:
Android (Google) Code Review
2009-07-06 20:44:44 -07:00
parent 879f7bcf41 33ababd1bd
commit 423ab2eb9d
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/vpn/AuthenticationActor.java
View File

@@ -70,9 +70,9 @@ public class AuthenticationActor implements VpnProfileActor {
TextView passwordView = (TextView) d.findViewById(R.id.password_value);
Context c = mContext;
if (TextUtils.isEmpty(usernameView.getText().toString())) {
return c.getString(R.string.vpn_username);
return c.getString(R.string.vpn_a_username);
} else if (TextUtils.isEmpty(passwordView.getText().toString())) {
return c.getString(R.string.vpn_password);
return c.getString(R.string.vpn_a_password);
} else {
return null;
}

2
src/com/android/settings/vpn/L2tpEditor.java
View File

@@ -57,7 +57,7 @@ class L2tpEditor extends VpnProfileEditor {
return ((result != null)
? result
: validate(mSecretString, R.string.vpn_l2tp_secret));
: validate(mSecretString, R.string.vpn_a_l2tp_secret));
}
private Preference createSecretPreference(Context c) {

4
src/com/android/settings/vpn/L2tpIpsecEditor.java
View File

@@ -55,10 +55,10 @@ class L2tpIpsecEditor extends L2tpEditor {
public String validate() {
String result = super.validate();
if (result == null) {
result = validate(mUserCertificate, R.string.vpn_user_certificate);
result = validate(mUserCertificate, R.string.vpn_a_user_certificate);
}
if (result == null) {
result = validate(mCaCertificate, R.string.vpn_ca_certificate);
result = validate(mCaCertificate, R.string.vpn_a_ca_certificate);
}
return result;
}

2
src/com/android/settings/vpn/L2tpIpsecPskEditor.java
View File

@@ -47,7 +47,7 @@ class L2tpIpsecPskEditor extends L2tpEditor {
return ((result != null)
? result
: validate(mPresharedKey, R.string.vpn_ipsec_presharedkey));
: validate(mPresharedKey, R.string.vpn_a_ipsec_presharedkey));
}
private Preference createPresharedKeyPreference(Context c) {

4
src/com/android/settings/vpn/VpnProfileEditor.java
View File

@@ -85,10 +85,10 @@ class VpnProfileEditor {
* null if all the inputs are valid
*/
public String validate() {
String result = validate(mName, R.string.vpn_name);
String result = validate(mName, R.string.vpn_a_name);
return ((result != null)
? result
: validate(mServerName, R.string.vpn_vpn_server));
: validate(mServerName, R.string.vpn_a_vpn_server));
}
/**