--- a/src/com/five_ten_sg/connectbot/util/HostDatabase.java	Mon Jul 14 08:46:06 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/util/HostDatabase.java	Mon Jul 14 09:42:20 2014 -0700
@@ -46,7 +46,7 @@
     public final static String TAG = "ConnectBot.HostDatabase";
 
     public final static String DB_NAME = "hosts";
-    public final static int DB_VERSION = 27;
+    public final static int DB_VERSION = 28;
 
     public final static String TABLE_HOSTS = "hosts";
     public final static String FIELD_HOST_NICKNAME = "nickname";
@@ -65,6 +65,9 @@
     public final static String FIELD_HOST_WANTSESSION = "wantsession";
     public final static String FIELD_HOST_DELKEY = "delkey";
     public final static String FIELD_HOST_FONTSIZE = "fontsize";
+    public final static String FIELD_HOST_FIXEDSIZE = "fixed_size";
+    public final static String FIELD_HOST_FIXEDWIDTH = "fixed_width";
+    public final static String FIELD_HOST_FIXEDHEIGHT = "fixed_height";
     public final static String FIELD_HOST_COMPRESSION = "compression";
     public final static String FIELD_HOST_HTTPPROXY = "httpproxy";
     public final static String FIELD_HOST_ENCODING = "encoding";
@@ -178,6 +181,9 @@
                    + FIELD_HOST_PUBKEYID + " INTEGER DEFAULT " + PUBKEYID_ANY + ", "
                    + FIELD_HOST_DELKEY + " TEXT DEFAULT '" + DELKEY_DEL + "', "
                    + FIELD_HOST_FONTSIZE + " REAL, "
+                   + FIELD_HOST_FIXEDSIZE + "  TEXT DEFAULT '" + Boolean.toString(false) + "', "
+                   + FIELD_HOST_FIXEDWIDTH + " INTEGER, "
+                   + FIELD_HOST_FIXEDHEIGHT + " INTEGER, "
                    + FIELD_HOST_WANTSESSION + " TEXT DEFAULT '" + Boolean.toString(true) + "', "
                    + FIELD_HOST_COMPRESSION + " TEXT DEFAULT '" + Boolean.toString(false) + "', "
                    + FIELD_HOST_HTTPPROXY + " TEXT, "
@@ -215,90 +221,14 @@
 
     @Override
     public void onRobustUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) throws SQLiteException {
-        // Versions of the database before the Android Market release will be
-        // shot without warning.
-        if (oldVersion <= 9) {
+        // Versions of the database before 510ConnectBot will be shot without warning.
+        if (oldVersion < 24) {
             db.execSQL("DROP TABLE IF EXISTS " + TABLE_HOSTS);
             onCreate(db);
             return;
         }
 
         switch (oldVersion) {
-            case 10:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_PUBKEYID + " INTEGER DEFAULT " + PUBKEYID_ANY);
-
-            case 11:
-                db.execSQL("CREATE TABLE " + TABLE_PORTFORWARDS
-                           + " (_id INTEGER PRIMARY KEY, "
-                           + FIELD_PORTFORWARD_HOSTID + " INTEGER, "
-                           + FIELD_PORTFORWARD_NICKNAME + " TEXT, "
-                           + FIELD_PORTFORWARD_TYPE + " TEXT NOT NULL DEFAULT " + PORTFORWARD_LOCAL + ", "
-                           + FIELD_PORTFORWARD_SOURCEPORT + " INTEGER NOT NULL DEFAULT 8080, "
-                           + FIELD_PORTFORWARD_DESTADDR + " TEXT, "
-                           + FIELD_PORTFORWARD_DESTPORT + " INTEGER)");
-
-            case 12:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_WANTSESSION + " TEXT DEFAULT '" + Boolean.toString(true) + "'");
-
-            case 13:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_COMPRESSION + " TEXT DEFAULT '" + Boolean.toString(false) + "'");
-
-            case 14:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_ENCODING + " TEXT DEFAULT '" + ENCODING_DEFAULT + "'");
-
-            case 15:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_PROTOCOL + " TEXT DEFAULT 'ssh'");
-
-            case 16:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_DELKEY + " TEXT DEFAULT '" + DELKEY_DEL + "'");
-
-            case 17:
-                db.execSQL("CREATE INDEX " + TABLE_PORTFORWARDS + FIELD_PORTFORWARD_HOSTID + "index ON "
-                           + TABLE_PORTFORWARDS + " (" + FIELD_PORTFORWARD_HOSTID + ");");
-                // Add colors
-                db.execSQL("CREATE TABLE " + TABLE_COLORS
-                           + " (_id INTEGER PRIMARY KEY, "
-                           + FIELD_COLOR_NUMBER + " INTEGER, "
-                           + FIELD_COLOR_VALUE + " INTEGER, "
-                           + FIELD_COLOR_SCHEME + " INTEGER)");
-                db.execSQL("CREATE INDEX " + TABLE_COLORS + FIELD_COLOR_SCHEME + "index ON "
-                           + TABLE_COLORS + " (" + FIELD_COLOR_SCHEME + ");");
-
-            case 18:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_USEAUTHAGENT + " TEXT DEFAULT '" + AUTHAGENT_NO + "'");
-
-            case 19:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_STAYCONNECTED + " TEXT");
-
-            case 20:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_FONTSIZE + " REAL");
-
-            case 21:
-                db.execSQL("DROP TABLE " + TABLE_COLOR_DEFAULTS);
-                db.execSQL(CREATE_TABLE_COLOR_DEFAULTS);
-                db.execSQL(CREATE_TABLE_COLOR_DEFAULTS_INDEX);
-
-            case 22:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_WANTX11FORWARD + " TEXT DEFAULT '" + Boolean.toString(false) + "'");
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_X11HOST + " TEXT DEFAULT '" + X11HOST_DEFAULT + "'");
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_X11PORT + " INTEGER DEFAULT " + X11PORT_DEFAULT);
-
-            case 23:
-                db.execSQL("ALTER TABLE " + TABLE_HOSTS
-                           + " ADD COLUMN " + FIELD_HOST_HTTPPROXY + " TEXT");
-
             case 24:
                 db.execSQL("ALTER TABLE " + TABLE_HOSTS
                            + " ADD COLUMN " + FIELD_HOST_MONITOR + " TEXT");
@@ -316,6 +246,14 @@
                            + " ADD COLUMN " + FIELD_HOST_MENU5250 + " TEXT");
                 db.execSQL("ALTER TABLE " + TABLE_HOSTS
                            + " ADD COLUMN " + FIELD_HOST_PROGRAM5250 + " TEXT");
+
+            case 27:
+                db.execSQL("ALTER TABLE " + TABLE_HOSTS
+                           + " ADD COLUMN " + FIELD_HOST_FIXEDSIZE + " TEXT DEFAULT '" + Boolean.toString(false) + "'");
+                db.execSQL("ALTER TABLE " + TABLE_HOSTS
+                           + " ADD COLUMN " + FIELD_HOST_FIXEDWIDTH + " INTEGER");
+                db.execSQL("ALTER TABLE " + TABLE_HOSTS
+                           + " ADD COLUMN " + FIELD_HOST_FIXEDHEIGHT + " INTEGER");
         }
     }
 
@@ -422,6 +360,9 @@
                   COL_WANTSESSION = c.getColumnIndexOrThrow(FIELD_HOST_WANTSESSION),
                   COL_DELKEY = c.getColumnIndexOrThrow(FIELD_HOST_DELKEY),
                   COL_FONTSIZE = c.getColumnIndexOrThrow(FIELD_HOST_FONTSIZE),
+                  COL_FIXEDSIZE = c.getColumnIndexOrThrow(FIELD_HOST_FIXEDSIZE),
+                  COL_FIXEDWIDTH = c.getColumnIndexOrThrow(FIELD_HOST_FIXEDWIDTH),
+                  COL_FIXEDHEIGHT = c.getColumnIndexOrThrow(FIELD_HOST_FIXEDHEIGHT),
                   COL_COMPRESSION = c.getColumnIndexOrThrow(FIELD_HOST_COMPRESSION),
                   COL_HTTPPROXY = c.getColumnIndexOrThrow(FIELD_HOST_HTTPPROXY),
                   COL_ENCODING = c.getColumnIndexOrThrow(FIELD_HOST_ENCODING),
@@ -450,9 +391,12 @@
             host.setUseAuthAgent(c.getString(COL_USEAUTHAGENT));
             host.setPostLogin(c.getString(COL_POSTLOGIN));
             host.setPubkeyId(c.getLong(COL_PUBKEYID));
-            host.setWantSession(Boolean.valueOf(c.getString(COL_WANTSESSION)));
             host.setDelKey(c.getString(COL_DELKEY));
             host.setFontSize(c.getFloat(COL_FONTSIZE));
+            host.setFixedSize(Boolean.valueOf(c.getString(COL_FIXEDSIZE)));
+            host.setFixedWidth(c.getLong(COL_FIXEDWIDTH));
+            host.setFixedHeight(c.getLong(COL_FIXEDHEIGHT));
+            host.setWantSession(Boolean.valueOf(c.getString(COL_WANTSESSION)));
             host.setCompression(Boolean.valueOf(c.getString(COL_COMPRESSION)));
             host.setHttpproxy(c.getString(COL_HTTPPROXY));
             host.setEncoding(c.getString(COL_ENCODING));