Migrate VpnProfile definition to framework.

Bug: 5756357
Change-Id: Icf4b2cb10e911216a2165f2afd1eb89152c5f1c0

diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index ca85d99..9ef269b 100644 (file)
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.vpn2;
 
+import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 
 import android.app.AlertDialog;

diff --git a/src/com/android/settings/vpn2/VpnProfile.java b/src/com/android/settings/vpn2/VpnProfile.java
deleted file mode 100644 (file)
index d4d0e79..0000000
--- a/src/com/android/settings/vpn2/VpnProfile.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2011 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.vpn2;
-
-import java.nio.charset.Charsets;
-
-/**
- * Parcel-like entity class for VPN profiles. To keep things simple, all
- * fields are package private. Methods are provided for serialization, so
- * storage can be implemented easily. Two rules are set for this class.
- * First, all fields must be kept non-null. Second, always make a copy
- * using clone() before modifying.
- */
-class VpnProfile implements Cloneable {
-    // Match these constants with R.array.vpn_types.
-    static final int TYPE_PPTP = 0;
-    static final int TYPE_L2TP_IPSEC_PSK = 1;
-    static final int TYPE_L2TP_IPSEC_RSA = 2;
-    static final int TYPE_IPSEC_XAUTH_PSK = 3;
-    static final int TYPE_IPSEC_XAUTH_RSA = 4;
-    static final int TYPE_IPSEC_HYBRID_RSA = 5;
-    static final int TYPE_MAX = 5;
-
-    // Entity fields.
-    final String key;           // -1
-    String name = "";           // 0
-    int type = TYPE_PPTP;       // 1
-    String server = "";         // 2
-    String username = "";       // 3
-    String password = "";       // 4
-    String dnsServers = "";     // 5
-    String searchDomains = "";  // 6
-    String routes = "";         // 7
-    boolean mppe = true;        // 8
-    String l2tpSecret = "";     // 9
-    String ipsecIdentifier = "";// 10
-    String ipsecSecret = "";    // 11
-    String ipsecUserCert = "";  // 12
-    String ipsecCaCert = "";    // 13
-    String ipsecServerCert = "";// 14
-
-    // Helper fields.
-    boolean saveLogin = false;
-
-    VpnProfile(String key) {
-        this.key = key;
-    }
-
-    static VpnProfile decode(String key, byte[] value) {
-        try {
-            if (key == null) {
-                return null;
-            }
-
-            String[] values = new String(value, Charsets.UTF_8).split("\0", -1);
-            // There can be 14 or 15 values in ICS MR1.
-            if (values.length < 14 || values.length > 15) {
-                return null;
-            }
-
-            VpnProfile profile = new VpnProfile(key);
-            profile.name = values[0];
-            profile.type = Integer.valueOf(values[1]);
-            if (profile.type < 0 || profile.type > TYPE_MAX) {
-                return null;
-            }
-            profile.server = values[2];
-            profile.username = values[3];
-            profile.password = values[4];
-            profile.dnsServers = values[5];
-            profile.searchDomains = values[6];
-            profile.routes = values[7];
-            profile.mppe = Boolean.valueOf(values[8]);
-            profile.l2tpSecret = values[9];
-            profile.ipsecIdentifier = values[10];
-            profile.ipsecSecret = values[11];
-            profile.ipsecUserCert = values[12];
-            profile.ipsecCaCert = values[13];
-            profile.ipsecServerCert = (values.length > 14) ? values[14] : "";
-
-            profile.saveLogin = !profile.username.isEmpty() || !profile.password.isEmpty();
-            return profile;
-        } catch (Exception e) {
-            // ignore
-        }
-        return null;
-    }
-
-    byte[] encode() {
-        StringBuilder builder = new StringBuilder(name);
-        builder.append('\0').append(type);
-        builder.append('\0').append(server);
-        builder.append('\0').append(saveLogin ? username : "");
-        builder.append('\0').append(saveLogin ? password : "");
-        builder.append('\0').append(dnsServers);
-        builder.append('\0').append(searchDomains);
-        builder.append('\0').append(routes);
-        builder.append('\0').append(mppe);
-        builder.append('\0').append(l2tpSecret);
-        builder.append('\0').append(ipsecIdentifier);
-        builder.append('\0').append(ipsecSecret);
-        builder.append('\0').append(ipsecUserCert);
-        builder.append('\0').append(ipsecCaCert);
-        builder.append('\0').append(ipsecServerCert);
-        return builder.toString().getBytes(Charsets.UTF_8);
-    }
-}

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a26623b..a8cb35d 100644 (file)
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -42,6 +42,7 @@ import android.widget.Toast;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
+import com.android.internal.net.VpnProfile;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.net.Inet4Address;