android: Add field for server port to data model

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 306f18b25312b3ea998e45d8474bb6f5bcb49c59..6b837833763259718f168b20d111af11a546bdcd 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,7 +20,7 @@ package org.strongswan.android.data;
 public class VpnProfile implements Cloneable
 {
        private String mName, mGateway, mUsername, mPassword, mCertificate, mUserCertificate;
-       private Integer mMTU;
+       private Integer mMTU, mPort;
        private VpnType mVpnType;
        private long mId = -1;
 
@@ -114,6 +114,16 @@ public class VpnProfile implements Cloneable
                this.mMTU = mtu;
        }
 
+       public Integer getPort()
+       {
+               return mPort;
+       }
+
+       public void setPort(Integer port)
+       {
+               this.mPort = port;
+       }
+
        @Override
        public String toString()
        {

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 e5e58252383b22cd100c3a8ca28554d02ea95a67..b9842a99c3f97965720d8b8cdf3f5c2cc4e22ed7 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java
+++ b/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java
@@ -41,6 +41,7 @@ public class VpnProfileDataSource
        public static final String KEY_CERTIFICATE = "certificate";
        public static final String KEY_USER_CERTIFICATE = "user_certificate";
        public static final String KEY_MTU = "mtu";
+       public static final String KEY_PORT = "port";
 
        private DatabaseHelper mDbHelper;
        private SQLiteDatabase mDatabase;
@@ -49,7 +50,7 @@ public class VpnProfileDataSource
        private static final String DATABASE_NAME = "strongswan.db";
        private static final String TABLE_VPNPROFILE = "vpnprofile";
 
-       private static final int DATABASE_VERSION = 5;
+       private static final int DATABASE_VERSION = 6;
 
        public static final String DATABASE_CREATE =
                                                        "CREATE TABLE " + TABLE_VPNPROFILE + " (" +
@@ -61,7 +62,8 @@ public class VpnProfileDataSource
                                                                KEY_PASSWORD + " TEXT," +
                                                                KEY_CERTIFICATE + " TEXT," +
                                                                KEY_USER_CERTIFICATE + " TEXT," +
-                                                               KEY_MTU + " INTEGER" +
+                                                               KEY_MTU + " INTEGER," +
+                                                               KEY_PORT + " INTEGER" +
                                                        ");";
        private static final String[] ALL_COLUMNS = new String[] {
                                                                KEY_ID,
@@ -73,6 +75,7 @@ public class VpnProfileDataSource
                                                                KEY_CERTIFICATE,
                                                                KEY_USER_CERTIFICATE,
                                                                KEY_MTU,
+                                                               KEY_PORT,
                                                        };
 
        private static class DatabaseHelper extends SQLiteOpenHelper
@@ -112,6 +115,11 @@ public class VpnProfileDataSource
                                db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_MTU +
                                                   " INTEGER;");
                        }
+                       if (oldVersion < 6)
+                       {
+                               db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_PORT +
+                                                  " INTEGER;");
+                       }
                }
 
                private void updateColumns(SQLiteDatabase db)
@@ -264,6 +272,7 @@ public class VpnProfileDataSource
                profile.setCertificateAlias(cursor.getString(cursor.getColumnIndex(KEY_CERTIFICATE)));
                profile.setUserCertificateAlias(cursor.getString(cursor.getColumnIndex(KEY_USER_CERTIFICATE)));
                profile.setMTU(getInt(cursor, cursor.getColumnIndex(KEY_MTU)));
+               profile.setPort(getInt(cursor, cursor.getColumnIndex(KEY_PORT)));
                return profile;
        }
 
@@ -278,6 +287,7 @@ public class VpnProfileDataSource
                values.put(KEY_CERTIFICATE, profile.getCertificateAlias());
                values.put(KEY_USER_CERTIFICATE, profile.getUserCertificateAlias());
                values.put(KEY_MTU, profile.getMTU());
+               values.put(KEY_PORT, profile.getPort());
                return values;
        }