* Changes + Add L2tpActor, L2tpEditor, L2tpIpsecPskActor. + Make L2tpIpsecEditor extend L2tpEditor. + Revise the code for saving username. Make VpnSettings.saveProfileToStorage() static. + Fix support for screen orientation change in both VpnSettings and VpnEditor. Patch Set 2: + Remove Util.isNullOrEmpty(). Use TextUtils.isEmpty() instead. + Remove unused imports. Wrap lines longer than 80 chars. Patch Set 3: + Fix all the strings according to UI feedback. + Remove all the added actor subclasses and move password to editor. + Remove VPN entry in Security & location. Patch Set 4: + Misc string fixes. Patch Set 5: + Add strings for credential storage settings. + Changed the error dialog icon. + Fix "Remember me" indentation in connect dialog. Patch Set 6: + resolve res/values/strings.xml
168 lines
5.5 KiB
Java
168 lines
5.5 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.app.AlertDialog;
|
|
import android.content.DialogInterface;
|
|
import android.content.Intent;
|
|
import android.net.vpn.L2tpIpsecProfile;
|
|
import android.net.vpn.L2tpProfile;
|
|
import android.net.vpn.VpnProfile;
|
|
import android.net.vpn.VpnType;
|
|
import android.os.Bundle;
|
|
import android.os.Parcelable;
|
|
import android.preference.PreferenceActivity;
|
|
import android.preference.PreferenceGroup;
|
|
import android.text.TextUtils;
|
|
import android.view.Menu;
|
|
import android.view.MenuItem;
|
|
import android.view.View;
|
|
|
|
/**
|
|
* The activity class for editing a new or existing VPN profile.
|
|
*/
|
|
public class VpnEditor extends PreferenceActivity {
|
|
private static final int MENU_SAVE = Menu.FIRST;
|
|
private static final int MENU_CANCEL = Menu.FIRST + 1;
|
|
private static final String KEY_PROFILE = "profile";
|
|
|
|
private VpnProfileEditor mProfileEditor;
|
|
private boolean mAddingProfile;
|
|
|
|
@Override
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
VpnProfile p = (VpnProfile) ((savedInstanceState == null)
|
|
? getIntent().getParcelableExtra(VpnSettings.KEY_VPN_PROFILE)
|
|
: savedInstanceState.getParcelable(KEY_PROFILE));
|
|
mProfileEditor = getEditor(p);
|
|
mAddingProfile = TextUtils.isEmpty(p.getName());
|
|
|
|
// Loads the XML preferences file
|
|
addPreferencesFromResource(R.xml.vpn_edit);
|
|
|
|
initViewFor(p);
|
|
}
|
|
|
|
@Override
|
|
protected synchronized void onSaveInstanceState(Bundle outState) {
|
|
if (mProfileEditor == null) return;
|
|
|
|
outState.putParcelable(KEY_PROFILE, getProfile());
|
|
}
|
|
|
|
@Override
|
|
public boolean onCreateOptionsMenu(Menu menu) {
|
|
super.onCreateOptionsMenu(menu);
|
|
menu.add(0, MENU_SAVE, 0, R.string.vpn_menu_done)
|
|
.setIcon(android.R.drawable.ic_menu_save);
|
|
menu.add(0, MENU_CANCEL, 0,
|
|
mAddingProfile ? R.string.vpn_menu_cancel
|
|
: R.string.vpn_menu_revert)
|
|
.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
public boolean onOptionsItemSelected(MenuItem item) {
|
|
switch (item.getItemId()) {
|
|
case MENU_SAVE:
|
|
if (validateAndSetResult()) {
|
|
finish();
|
|
}
|
|
return true;
|
|
case MENU_CANCEL:
|
|
showCancellationConfirmDialog();
|
|
return true;
|
|
}
|
|
return super.onOptionsItemSelected(item);
|
|
}
|
|
|
|
private void initViewFor(VpnProfile profile) {
|
|
setTitle(profile);
|
|
mProfileEditor.loadPreferencesTo(getPreferenceScreen());
|
|
}
|
|
|
|
private void setTitle(VpnProfile profile) {
|
|
String formatString = mAddingProfile
|
|
? getString(R.string.vpn_edit_title_add)
|
|
: getString(R.string.vpn_edit_title_edit);
|
|
setTitle(String.format(formatString,
|
|
profile.getType().getDisplayName()));
|
|
}
|
|
|
|
/**
|
|
* Checks the validity of the inputs and set the profile as result if valid.
|
|
* @return true if the result is successfully set
|
|
*/
|
|
private boolean validateAndSetResult() {
|
|
String errorMsg = mProfileEditor.validate();
|
|
|
|
if (errorMsg != null) {
|
|
Util.showErrorMessage(this, errorMsg);
|
|
return false;
|
|
}
|
|
|
|
setResult(getProfile());
|
|
return true;
|
|
}
|
|
|
|
private void setResult(VpnProfile p) {
|
|
p.setId(Util.base64Encode(p.getName().getBytes()));
|
|
Intent intent = new Intent(this, VpnSettings.class);
|
|
intent.putExtra(VpnSettings.KEY_VPN_PROFILE, (Parcelable) p);
|
|
setResult(RESULT_OK, intent);
|
|
}
|
|
|
|
private VpnProfileEditor getEditor(VpnProfile p) {
|
|
switch (p.getType()) {
|
|
case L2TP_IPSEC:
|
|
return new L2tpIpsecEditor((L2tpIpsecProfile) p);
|
|
|
|
case L2TP_IPSEC_PSK:
|
|
case L2TP:
|
|
return new L2tpEditor((L2tpProfile) p);
|
|
|
|
default:
|
|
return new VpnProfileEditor(p);
|
|
}
|
|
}
|
|
|
|
private void showCancellationConfirmDialog() {
|
|
new AlertDialog.Builder(this)
|
|
.setTitle(android.R.string.dialog_alert_title)
|
|
.setIcon(android.R.drawable.ic_dialog_alert)
|
|
.setMessage(mAddingProfile
|
|
? R.string.vpn_confirm_add_profile_cancellation
|
|
: R.string.vpn_confirm_edit_profile_cancellation)
|
|
.setPositiveButton(R.string.vpn_yes_button,
|
|
new DialogInterface.OnClickListener() {
|
|
public void onClick(DialogInterface dialog, int w) {
|
|
finish();
|
|
}
|
|
})
|
|
.setNegativeButton(R.string.vpn_mistake_button, null)
|
|
.show();
|
|
}
|
|
|
|
private VpnProfile getProfile() {
|
|
return mProfileEditor.getProfile();
|
|
}
|
|
}
|