android: Field added to store the type of a VPN profile

diff --git a/src/frontends/android/src/org/strongswan/android/data/VpnProfile.java b/src/frontends/android/src/org/strongswan/android/data/VpnProfile.java
index fea9e5c..8323826 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/data/VpnProfile.java
+++ b/src/frontends/android/src/org/strongswan/android/data/VpnProfile.java
@@ -20,6 +20,7 @@ package org.strongswan.android.data;
 public class VpnProfile implements Cloneable
 {
        private String mName, mGateway, mUsername, mPassword, mCertificate, mUserCertificate;
 public class VpnProfile implements Cloneable
 {
        private String mName, mGateway, mUsername, mPassword, mCertificate, mUserCertificate;

+       private VpnType mVpnType;

        private long mId = -1;
 
        public long getId()
        private long mId = -1;
 
        public long getId()


@@ -52,6 +53,16 @@ public class VpnProfile implements Cloneable
                this.mGateway = gateway;
        }
 
                this.mGateway = gateway;
        }
 

+       public VpnType getVpnType()
+       {
+               return mVpnType;
+       }
+
+       public void setVpnType(VpnType type)
+       {
+               this.mVpnType = type;
+       }
+

        public String getUsername()
        {
                return mUsername;
        public String getUsername()
        {
                return mUsername;

diff --git a/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java b/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java
index a6c6f5e..ccc88c1 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java
+++ b/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java
@@ -34,6 +34,7 @@ public class VpnProfileDataSource
        public static final String KEY_ID = "_id";
        public static final String KEY_NAME = "name";
        public static final String KEY_GATEWAY = "gateway";
        public static final String KEY_ID = "_id";
        public static final String KEY_NAME = "name";
        public static final String KEY_GATEWAY = "gateway";

+       public static final String KEY_VPN_TYPE = "vpn_type";

        public static final String KEY_USERNAME = "username";
        public static final String KEY_PASSWORD = "password";
        public static final String KEY_CERTIFICATE = "certificate";
        public static final String KEY_USERNAME = "username";
        public static final String KEY_PASSWORD = "password";
        public static final String KEY_CERTIFICATE = "certificate";


@@ -46,13 +47,14 @@ public class VpnProfileDataSource
        private static final String DATABASE_NAME = "strongswan.db";
        private static final String TABLE_VPNPROFILE = "vpnprofile";
 
        private static final String DATABASE_NAME = "strongswan.db";
        private static final String TABLE_VPNPROFILE = "vpnprofile";
 

-       private static final int DATABASE_VERSION = 2;
+       private static final int DATABASE_VERSION = 3;

 
        public static final String DATABASE_CREATE =
                                                        "CREATE TABLE " + TABLE_VPNPROFILE + " (" +
                                                                KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
                                                                KEY_NAME + " TEXT NOT NULL," +
                                                                KEY_GATEWAY + " TEXT NOT NULL," +
 
        public static final String DATABASE_CREATE =
                                                        "CREATE TABLE " + TABLE_VPNPROFILE + " (" +
                                                                KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
                                                                KEY_NAME + " TEXT NOT NULL," +
                                                                KEY_GATEWAY + " TEXT NOT NULL," +

+                                                               KEY_VPN_TYPE + " TEXT NOT NULL," +

                                                                KEY_USERNAME + " TEXT NOT NULL," +
                                                                KEY_PASSWORD + " TEXT," +
                                                                KEY_CERTIFICATE + " TEXT," +
                                                                KEY_USERNAME + " TEXT NOT NULL," +
                                                                KEY_PASSWORD + " TEXT," +
                                                                KEY_CERTIFICATE + " TEXT," +


@@ -62,6 +64,7 @@ public class VpnProfileDataSource
                                                                KEY_ID,
                                                                KEY_NAME,
                                                                KEY_GATEWAY,
                                                                KEY_ID,
                                                                KEY_NAME,
                                                                KEY_GATEWAY,

+                                                               KEY_VPN_TYPE,

                                                                KEY_USERNAME,
                                                                KEY_PASSWORD,
                                                                KEY_CERTIFICATE,
                                                                KEY_USERNAME,
                                                                KEY_PASSWORD,
                                                                KEY_CERTIFICATE,


@@ -91,6 +94,11 @@ public class VpnProfileDataSource
                                db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_USER_CERTIFICATE +
                                                   " TEXT;");
                        }
                                db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_USER_CERTIFICATE +
                                                   " TEXT;");
                        }

+                       if (oldVersion < 3)
+                       {
+                               db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_VPN_TYPE +
+                                                  " TEXT DEFAULT '';");
+                       }

                }
        }
 
                }
        }
 


@@ -218,6 +226,7 @@ public class VpnProfileDataSource
                profile.setId(cursor.getLong(cursor.getColumnIndex(KEY_ID)));
                profile.setName(cursor.getString(cursor.getColumnIndex(KEY_NAME)));
                profile.setGateway(cursor.getString(cursor.getColumnIndex(KEY_GATEWAY)));
                profile.setId(cursor.getLong(cursor.getColumnIndex(KEY_ID)));
                profile.setName(cursor.getString(cursor.getColumnIndex(KEY_NAME)));
                profile.setGateway(cursor.getString(cursor.getColumnIndex(KEY_GATEWAY)));

+               profile.setVpnType(VpnType.fromIdentifier(cursor.getString(cursor.getColumnIndex(KEY_VPN_TYPE))));

                profile.setUsername(cursor.getString(cursor.getColumnIndex(KEY_USERNAME)));
                profile.setPassword(cursor.getString(cursor.getColumnIndex(KEY_PASSWORD)));
                profile.setCertificateAlias(cursor.getString(cursor.getColumnIndex(KEY_CERTIFICATE)));
                profile.setUsername(cursor.getString(cursor.getColumnIndex(KEY_USERNAME)));
                profile.setPassword(cursor.getString(cursor.getColumnIndex(KEY_PASSWORD)));
                profile.setCertificateAlias(cursor.getString(cursor.getColumnIndex(KEY_CERTIFICATE)));


@@ -230,6 +239,7 @@ public class VpnProfileDataSource
                ContentValues values = new ContentValues();
                values.put(KEY_NAME, profile.getName());
                values.put(KEY_GATEWAY, profile.getGateway());
                ContentValues values = new ContentValues();
                values.put(KEY_NAME, profile.getName());
                values.put(KEY_GATEWAY, profile.getGateway());

+               values.put(KEY_VPN_TYPE, profile.getVpnType().getIdentifier());

                values.put(KEY_USERNAME, profile.getUsername());
                values.put(KEY_PASSWORD, profile.getPassword());
                values.put(KEY_CERTIFICATE, profile.getCertificateAlias());
                values.put(KEY_USERNAME, profile.getUsername());
                values.put(KEY_PASSWORD, profile.getPassword());
                values.put(KEY_CERTIFICATE, profile.getCertificateAlias());