Get rid of useless backup dbLock usage

7 files changed, 13 insertions, 80 deletions

diff --git a/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java b/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java
index 55e84ac..17db685 100644
--- a/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java
+++ b/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java
@@ -300,7 +300,6 @@ public class GeneratePubkeyActivity extends Activity implements OnEntropyGathere
 
 				PubkeyDatabase pubkeydb = PubkeyDatabase.get(GeneratePubkeyActivity.this);
 				pubkeydb.savePubkey(pubkey);
-				pubkeydb.close();
 			} catch (Exception e) {
 				Log.e(TAG, "Could not generate key pair");
 
diff --git a/app/src/main/java/org/connectbot/HostEditorActivity.java b/app/src/main/java/org/connectbot/HostEditorActivity.java
index 6bd7b14..a213aa4 100644
--- a/app/src/main/java/org/connectbot/HostEditorActivity.java
+++ b/app/src/main/java/org/connectbot/HostEditorActivity.java
@@ -66,9 +66,9 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 
 		protected final void cacheValues() {
 			// fill a cursor and cache the values locally
-			// this makes sure we dont have any floating cursor to dispose later
+			// this makes sure we don't have any floating cursor to dispose later
 
-			SQLiteDatabase db = hostdb.getReadableDatabase();
+			SQLiteDatabase db = hostdb.getWritableDatabase();
 			Cursor cursor = db.query(table, null, "_id = ?",
 					new String[] { String.valueOf(id) }, null, null, null);
 
@@ -81,23 +81,6 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 				}
 			}
 			cursor.close();
-			db.close();
-
-//			db = pubkeydb.getReadableDatabase();
-//			cursor = db.query(PubkeyDatabase.TABLE_PUBKEYS,
-//					new String[] { "_id", PubkeyDatabase.FIELD_PUBKEY_NICKNAME },
-//					null, null, null, null, null);
-//
-//			if (cursor.moveToFirst()) {
-//				do {
-//					String pubkeyid = String.valueOf(cursor.getLong(0));
-//					String value = cursor.getString(1);
-//					pubkeys.put(pubkeyid, value);
-//				} while (cursor.moveToNext());
-//			}
-//
-//			cursor.close();
-//			db.close();
 		}
 
 		public boolean contains(String key) {
@@ -118,7 +101,6 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 				//Log.d(this.getClass().toString(), "commit() changes back to database");
 				SQLiteDatabase db = hostdb.getWritableDatabase();
 				db.update(table, update, "_id = ?", new String[] { String.valueOf(id) });
-				db.close();
 
 				// make sure we refresh the parent cached values
 				cacheValues();
@@ -306,11 +288,8 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 
 		bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
-		if (this.hostdb == null)
-			this.hostdb = HostDatabase.get(this);
-
-		if (this.pubkeydb == null)
-			this.pubkeydb = PubkeyDatabase.get(this);
+		hostdb = HostDatabase.get(this);
+		pubkeydb = PubkeyDatabase.get(this);
 	}
 
 	@Override
@@ -319,15 +298,8 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 
 		unbindService(connection);
 
-		if (this.hostdb != null) {
-			this.hostdb.close();
-			this.hostdb = null;
-		}
-
-		if (this.pubkeydb != null) {
-			this.pubkeydb.close();
-			this.pubkeydb = null;
-		}
+		hostdb = null;
+		pubkeydb = null;
 	}
 
 	private void updateSummaries() {
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index f2a0d93..4c0a443 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -126,8 +126,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 		// start the terminal manager service
 		this.bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
-		if (this.hostdb == null)
-			this.hostdb = HostDatabase.get(this);
+		hostdb = HostDatabase.get(this);
 	}
 
 	@Override
@@ -135,10 +134,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 		super.onStop();
 		this.unbindService(connection);
 
-		if (this.hostdb != null) {
-			this.hostdb.close();
-			this.hostdb = null;
-		}
+		hostdb = null;
 
 		closeOnDisconnectAll = true;
 	}
diff --git a/app/src/main/java/org/connectbot/PortForwardListActivity.java b/app/src/main/java/org/connectbot/PortForwardListActivity.java
index 84e9ab8..b0f835d 100644
--- a/app/src/main/java/org/connectbot/PortForwardListActivity.java
+++ b/app/src/main/java/org/connectbot/PortForwardListActivity.java
@@ -84,8 +84,7 @@ public class PortForwardListActivity extends ListActivity {
 
 		this.bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
-		if (this.hostdb == null)
-			this.hostdb = HostDatabase.get(this);
+		hostdb = HostDatabase.get(this);
 	}
 
 	@Override
@@ -94,10 +93,7 @@ public class PortForwardListActivity extends ListActivity {
 
 		this.unbindService(connection);
 
-		if (this.hostdb != null) {
-			this.hostdb.close();
-			this.hostdb = null;
-		}
+		hostdb = null;
 	}
 
 	@Override
diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java
index 2f2b0c2..5480cb2 100644
--- a/app/src/main/java/org/connectbot/PubkeyListActivity.java
+++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java
@@ -130,10 +130,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 
 		unbindService(connection);
 
-		if (pubkeydb != null) {
-			pubkeydb.close();
-			pubkeydb = null;
-		}
+		pubkeydb = null;
 	}
 
 	@Override
diff --git a/app/src/main/java/org/connectbot/service/BackupAgent.java b/app/src/main/java/org/connectbot/service/BackupAgent.java
index 312ae3b..f1a69a3 100644
--- a/app/src/main/java/org/connectbot/service/BackupAgent.java
+++ b/app/src/main/java/org/connectbot/service/BackupAgent.java
@@ -53,24 +53,4 @@ public class BackupAgent extends BackupAgentHelper {
 		addHelper(PubkeyDatabase.DB_NAME, pubkeys);
 
 	}
-
-	@Override
-	public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
-			ParcelFileDescriptor newState) throws IOException {
-		synchronized (HostDatabase.dbLock) {
-			super.onBackup(oldState, data, newState);
-		}
-	}
-
-	@Override
-	public void onRestore(BackupDataInput data, int appVersionCode,
-			ParcelFileDescriptor newState) throws IOException {
-		Log.d("ConnectBot.BackupAgent", "onRestore called");
-
-		synchronized (HostDatabase.dbLock) {
-			Log.d("ConnectBot.BackupAgent", "onRestore in-lock");
-
-			super.onRestore(data, appVersionCode, newState);
-		}
-	}
 }
diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java
index 7e0f4c7..1f0ee29 100644
--- a/app/src/main/java/org/connectbot/service/TerminalManager.java
+++ b/app/src/main/java/org/connectbot/service/TerminalManager.java
@@ -173,15 +173,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 		disconnectAll(true, false);
 
-		if (hostdb != null) {
-			hostdb.close();
-			hostdb = null;
-		}
-
-		if (pubkeydb != null) {
-			pubkeydb.close();
-			pubkeydb = null;
-		}
+		hostdb = null;
+		pubkeydb = null;
 
 		synchronized (this) {
 			if (idleTimer != null)