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

Remove use of SingleServerProfile.

Browse Source 
* changes
  + mv SingleServerEditor.java VpnProfileEditor.java
  + Add loadExtraPreferecesTo() to VpnProfileEditor
  + Make L2tpIpsecEditor extend VpnProfileEditor and use loadExtraPreferencesTo()
  + Modify VpnEditor.getEditor() accordingly
This commit is contained in:
Hung-ying Tyan
2009-06-15 12:36:04 +08:00
parent a55ae92a13
commit 84cfb0dc9b
4 changed files with 98 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ import android.security.Keystore;
/**
* The class for editing {@link L2tpIpsecProfile}.
*/
class L2tpIpsecEditor extends SingleServerEditor {
class L2tpIpsecEditor extends VpnProfileEditor {
private static final String TAG = L2tpIpsecEditor.class.getSimpleName();
private ListPreference mUserCertificate;
@@ -43,17 +43,15 @@ class L2tpIpsecEditor extends SingleServerEditor {
mProfile = p;
}
//@Override
public void loadPreferencesTo(PreferenceGroup subsettings) {
super.loadPreferencesTo(subsettings);
Context c = subsettings.getContext();
subsettings.addPreference(createUserkeyPreference(c));
subsettings.addPreference(createUserCertificatePreference(c));
subsettings.addPreference(createCaCertificatePreference(c));
subsettings.addPreference(createDomainSufficesPreference(c));
@Override
protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
Context c = subpanel.getContext();
subpanel.addPreference(createUserkeyPreference(c));
subpanel.addPreference(createUserCertificatePreference(c));
subpanel.addPreference(createCaCertificatePreference(c));
}
//@Override
@Override
public String validate(Context c) {
String result = super.validate(c);
if (result != null) {