+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)" instead of two dots. Patch Set 2: + Show cancellation confirmation dialog only when there's change in profile. Patch Set 3: + Re-enable profile preferences when the reconnect dialog is cancelled.
69 lines
2.2 KiB
Java
69 lines
2.2 KiB
Java
/*
|
|
* Copyright (C) 2009 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.vpn;
|
|
|
|
import com.android.settings.R;
|
|
|
|
import android.content.Context;
|
|
import android.net.vpn.L2tpIpsecPskProfile;
|
|
import android.preference.EditTextPreference;
|
|
import android.preference.Preference;
|
|
import android.preference.PreferenceGroup;
|
|
|
|
/**
|
|
* The class for editing {@link L2tpIpsecPskProfile}.
|
|
*/
|
|
class L2tpIpsecPskEditor extends L2tpEditor {
|
|
private EditTextPreference mPresharedKey;
|
|
private SecretHandler mPskHandler;
|
|
|
|
public L2tpIpsecPskEditor(L2tpIpsecPskProfile p) {
|
|
super(p);
|
|
}
|
|
|
|
@Override
|
|
protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
|
|
Context c = subpanel.getContext();
|
|
subpanel.addPreference(createPresharedKeyPreference(c));
|
|
super.loadExtraPreferencesTo(subpanel);
|
|
}
|
|
|
|
@Override
|
|
public String validate() {
|
|
String result = super.validate();
|
|
|
|
return ((result != null) ? result : mPskHandler.validate());
|
|
}
|
|
|
|
private Preference createPresharedKeyPreference(Context c) {
|
|
SecretHandler pskHandler = mPskHandler = new SecretHandler(c,
|
|
R.string.vpn_ipsec_presharedkey_title,
|
|
R.string.vpn_ipsec_presharedkey) {
|
|
@Override
|
|
protected String getSecretFromProfile() {
|
|
return ((L2tpIpsecPskProfile) getProfile()).getPresharedKey();
|
|
}
|
|
|
|
@Override
|
|
protected void saveSecretToProfile(String secret) {
|
|
((L2tpIpsecPskProfile) getProfile()).setPresharedKey(secret);
|
|
}
|
|
};
|
|
return pskHandler.getPreference();
|
|
}
|
|
}
|