diff options
author | Hung-ying Tyan <tyanh@google.com> | 2009-06-15 11:30:11 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2009-06-15 13:06:03 +0800 |
commit | 4c424d61c72af64b4fa1da5e1c52eaebf60fe36e (patch) | |
tree | 173c1b62ae23e4dee284808042fbd601431f56d6 /vpn/java | |
parent | 31390c752828dce0a33d0adeacdf10a49ff847ce (diff) | |
download | frameworks_base-4c424d61c72af64b4fa1da5e1c52eaebf60fe36e.zip frameworks_base-4c424d61c72af64b4fa1da5e1c52eaebf60fe36e.tar.gz frameworks_base-4c424d61c72af64b4fa1da5e1c52eaebf60fe36e.tar.bz2 |
On the way of refactoring out SingleServerProfile.java.
+ Move mServerName from SingleServerProfile and VpnProfile.
+ Add mSavedUsername to VpnProfile.
+ Keep empty SingleServerProfile to not break the classes that use it.
+ Remove use of SingleServerProfile from VpnService.java.
Diffstat (limited to 'vpn/java')
-rw-r--r-- | vpn/java/android/net/vpn/SingleServerProfile.java | 21 | ||||
-rw-r--r-- | vpn/java/android/net/vpn/VpnProfile.java | 25 |
2 files changed, 25 insertions, 21 deletions
diff --git a/vpn/java/android/net/vpn/SingleServerProfile.java b/vpn/java/android/net/vpn/SingleServerProfile.java index 59b5a7b..b766c5a 100644 --- a/vpn/java/android/net/vpn/SingleServerProfile.java +++ b/vpn/java/android/net/vpn/SingleServerProfile.java @@ -23,25 +23,4 @@ import android.os.Parcel; * {@hide} */ public abstract class SingleServerProfile extends VpnProfile { - private String mServerName; - - public void setServerName(String name) { - mServerName = name; - } - - public String getServerName() { - return mServerName; - } - - @Override - protected void readFromParcel(Parcel in) { - super.readFromParcel(in); - mServerName = in.readString(); - } - - @Override - public void writeToParcel(Parcel parcel, int flags) { - super.writeToParcel(parcel, flags); - parcel.writeString(mServerName); - } } diff --git a/vpn/java/android/net/vpn/VpnProfile.java b/vpn/java/android/net/vpn/VpnProfile.java index 1bfc102..9e24da4 100644 --- a/vpn/java/android/net/vpn/VpnProfile.java +++ b/vpn/java/android/net/vpn/VpnProfile.java @@ -31,8 +31,10 @@ public abstract class VpnProfile implements Parcelable, Serializable { private static final long serialVersionUID = 1L; private String mName; // unique display name private String mId; // unique identifier + private String mServerName; // VPN server name private String mDomainSuffices; // space separated list private String mRouteList; // space separated list + private String mSavedUsername; private boolean mIsCustomized; private transient VpnState mState = VpnState.IDLE; @@ -58,6 +60,17 @@ public abstract class VpnProfile implements Parcelable, Serializable { } /** + * Sets the name of the VPN server. Used for DNS lookup. + */ + public void setServerName(String name) { + mServerName = name; + } + + public String getServerName() { + return mServerName; + } + + /** * Sets the domain suffices for DNS resolution. * * @param entries a comma-separated list of domain suffices @@ -84,6 +97,14 @@ public abstract class VpnProfile implements Parcelable, Serializable { return mRouteList; } + public void setSavedUsername(String name) { + mSavedUsername = name; + } + + public String getSavedUsername() { + return mSavedUsername; + } + public void setState(VpnState state) { mState = state; } @@ -116,8 +137,10 @@ public abstract class VpnProfile implements Parcelable, Serializable { protected void readFromParcel(Parcel in) { mName = in.readString(); mId = in.readString(); + mServerName = in.readString(); mDomainSuffices = in.readString(); mRouteList = in.readString(); + mSavedUsername = in.readString(); } public static final Parcelable.Creator<VpnProfile> CREATOR = @@ -142,8 +165,10 @@ public abstract class VpnProfile implements Parcelable, Serializable { parcel.writeInt(mIsCustomized ? 1 : 0); parcel.writeString(mName); parcel.writeString(mId); + parcel.writeString(mServerName); parcel.writeString(mDomainSuffices); parcel.writeString(mRouteList); + parcel.writeString(mSavedUsername); } public int describeContents() { |