From f38a673ff4e7ccfd85abec14f76ebf5e4f8cfeba Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Fri, 11 Sep 2015 13:10:42 -0700
Subject: Call saveHost instead of specialized updateFontSize

---
 .../org/connectbot/service/TerminalBridge.java     |  2 +-
 .../java/org/connectbot/util/HostDatabase.java     | 33 +++++-----------------
 2 files changed, 8 insertions(+), 27 deletions(-)

(limited to 'app/src/main/java/org')

diff --git a/app/src/main/java/org/connectbot/service/TerminalBridge.java b/app/src/main/java/org/connectbot/service/TerminalBridge.java
index 6d47f96..6e4990e 100644
--- a/app/src/main/java/org/connectbot/service/TerminalBridge.java
+++ b/app/src/main/java/org/connectbot/service/TerminalBridge.java
@@ -533,7 +533,7 @@ public class TerminalBridge implements VDUDisplay {
 		}
 
 		host.setFontSize((int) sizeDp);
-		manager.hostdb.updateFontSize(host);
+		manager.hostdb.saveHost(host);
 
 		forcedSize = false;
 	}
diff --git a/app/src/main/java/org/connectbot/util/HostDatabase.java b/app/src/main/java/org/connectbot/util/HostDatabase.java
index e077409..7c59807 100644
--- a/app/src/main/java/org/connectbot/util/HostDatabase.java
+++ b/app/src/main/java/org/connectbot/util/HostDatabase.java
@@ -343,14 +343,18 @@ public class HostDatabase extends RobustSQLiteOpenHelper implements HostStorage,
 	}
 
 	/**
-	 * Create a new host using the given parameters.
+	 * Create a new or update an existing {@code host}.
 	 */
 	public HostBean saveHost(HostBean host) {
-		long id;
+		long id = host.getId();
 
 		mDb.beginTransaction();
 		try {
-			id = mDb.insert(TABLE_HOSTS, null, host.getValues());
+			if (id == -1) {
+				id = mDb.insert(TABLE_HOSTS, null, host.getValues());
+			} else {
+				mDb.update(TABLE_HOSTS, host.getValues(), "_id = ?", new String[] {String.valueOf(id)});
+			}
 			mDb.setTransactionSuccessful();
 		} finally {
 			mDb.endTransaction();
@@ -361,29 +365,6 @@ public class HostDatabase extends RobustSQLiteOpenHelper implements HostStorage,
 		return host;
 	}
 
-	/**
-	 * Update a field in a host record.
-	 */
-	public boolean updateFontSize(HostBean host) {
-		long id = host.getId();
-		if (id < 0)
-			return false;
-
-		ContentValues updates = new ContentValues();
-		updates.put(FIELD_HOST_FONTSIZE, host.getFontSize());
-
-		mDb.beginTransaction();
-		try {
-			mDb.update(TABLE_HOSTS, updates, "_id = ?",
-					new String[] {String.valueOf(id)});
-			mDb.setTransactionSuccessful();
-		} finally {
-			mDb.endTransaction();
-		}
-
-		return true;
-	}
-
 	/**
 	 * Delete a specific host by its <code>_id</code> value.
 	 */
-- 
cgit v1.2.3