Change all database accessors to use singleton

8 files changed, 18 insertions, 18 deletions

diff --git a/app/src/main/java/org/connectbot/ColorsActivity.java b/app/src/main/java/org/connectbot/ColorsActivity.java
index be5dfb1..54f52da 100644
--- a/app/src/main/java/org/connectbot/ColorsActivity.java
+++ b/app/src/main/java/org/connectbot/ColorsActivity.java
@@ -74,7 +74,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 
 		mColorScheme = HostDatabase.DEFAULT_COLOR_SCHEME;
 
-		mHostDb = new HostDatabase(this);
+		mHostDb = HostDatabase.get(this);
 
 		mColorList = Arrays.asList(mHostDb.getColorsForScheme(mColorScheme));
 		mDefaultColors = mHostDb.getDefaultColorsForScheme(mColorScheme);
@@ -110,7 +110,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 		super.onResume();
 
 		if (mHostDb == null)
-			mHostDb = new HostDatabase(this);
+			mHostDb = HostDatabase.get(this);
 	}
 
 	private class ColorsAdapter extends BaseAdapter {
diff --git a/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java b/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java
index 7510394..55e84ac 100644
--- a/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java
+++ b/app/src/main/java/org/connectbot/GeneratePubkeyActivity.java
@@ -298,7 +298,7 @@ public class GeneratePubkeyActivity extends Activity implements OnEntropyGathere
 				pubkey.setStartup(unlockAtStartup.isChecked());
 				pubkey.setConfirmUse(confirmUse.isChecked());
 
-				PubkeyDatabase pubkeydb = new PubkeyDatabase(GeneratePubkeyActivity.this);
+				PubkeyDatabase pubkeydb = PubkeyDatabase.get(GeneratePubkeyActivity.this);
 				pubkeydb.savePubkey(pubkey);
 				pubkeydb.close();
 			} catch (Exception e) {
diff --git a/app/src/main/java/org/connectbot/HostEditorActivity.java b/app/src/main/java/org/connectbot/HostEditorActivity.java
index 3976858..6bd7b14 100644
--- a/app/src/main/java/org/connectbot/HostEditorActivity.java
+++ b/app/src/main/java/org/connectbot/HostEditorActivity.java
@@ -244,8 +244,8 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 		// TODO: we could pass through a specific ContentProvider uri here
 		//this.getPreferenceManager().setSharedPreferencesName(uri);
 
-		this.hostdb = new HostDatabase(this);
-		this.pubkeydb = new PubkeyDatabase(this);
+		this.hostdb = HostDatabase.get(this);
+		this.pubkeydb = PubkeyDatabase.get(this);
 
 		host = hostdb.findHostById(hostId);
 
@@ -307,10 +307,10 @@ public class HostEditorActivity extends PreferenceActivity implements OnSharedPr
 		bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
 		if (this.hostdb == null)
-			this.hostdb = new HostDatabase(this);
+			this.hostdb = HostDatabase.get(this);
 
 		if (this.pubkeydb == null)
-			this.pubkeydb = new PubkeyDatabase(this);
+			this.pubkeydb = PubkeyDatabase.get(this);
 	}
 
 	@Override
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index 0e6fa3e..f2a0d93 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -127,7 +127,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 		this.bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
 		if (this.hostdb == null)
-			this.hostdb = new HostDatabase(this);
+			this.hostdb = HostDatabase.get(this);
 	}
 
 	@Override
@@ -210,7 +210,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 								|| Intent.ACTION_PICK.equals(getIntent().getAction());
 
 		// connect with hosts database and populate list
-		this.hostdb = new HostDatabase(this);
+		this.hostdb = HostDatabase.get(this);
 		ListView list = this.getListView();
 
 		this.sortedByColor = prefs.getBoolean(PreferenceConstants.SORT_BY_COLOR, false);
@@ -490,7 +490,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 		}
 
 		if (hostdb == null)
-			hostdb = new HostDatabase(this);
+			hostdb = HostDatabase.get(this);
 
 		hosts = hostdb.getHosts(sortedByColor);
 
diff --git a/app/src/main/java/org/connectbot/PortForwardListActivity.java b/app/src/main/java/org/connectbot/PortForwardListActivity.java
index c1a6b75..84e9ab8 100644
--- a/app/src/main/java/org/connectbot/PortForwardListActivity.java
+++ b/app/src/main/java/org/connectbot/PortForwardListActivity.java
@@ -85,7 +85,7 @@ public class PortForwardListActivity extends ListActivity {
 		this.bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
 		if (this.hostdb == null)
-			this.hostdb = new HostDatabase(this);
+			this.hostdb = HostDatabase.get(this);
 	}
 
 	@Override
@@ -109,7 +109,7 @@ public class PortForwardListActivity extends ListActivity {
 		setContentView(R.layout.act_portforwardlist);
 
 		// connect with hosts database and populate list
-		this.hostdb = new HostDatabase(this);
+		this.hostdb = HostDatabase.get(this);
 		host = hostdb.findHostById(hostId);
 
 		{
diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java
index 6004327..2f2b0c2 100644
--- a/app/src/main/java/org/connectbot/PubkeyListActivity.java
+++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java
@@ -121,7 +121,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 		bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
 		if (pubkeydb == null)
-			pubkeydb = new PubkeyDatabase(this);
+			pubkeydb = PubkeyDatabase.get(this);
 	}
 
 	@Override
@@ -146,7 +146,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 				getResources().getText(R.string.title_pubkey_list)));
 
 		// connect with hosts database and populate list
-		pubkeydb = new PubkeyDatabase(this);
+		pubkeydb = PubkeyDatabase.get(this);
 
 		updateList();
 
@@ -546,7 +546,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 
 			// write new value into database
 			if (pubkeydb == null)
-				pubkeydb = new PubkeyDatabase(this);
+				pubkeydb = PubkeyDatabase.get(this);
 			pubkeydb.savePubkey(pubkey);
 
 			updateList();
diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java
index 5416ddb..7e0f4c7 100644
--- a/app/src/main/java/org/connectbot/service/TerminalManager.java
+++ b/app/src/main/java/org/connectbot/service/TerminalManager.java
@@ -129,8 +129,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 		pubkeyTimer = new Timer("pubkeyTimer", true);
 
-		hostdb = new HostDatabase(this);
-		pubkeydb = new PubkeyDatabase(this);
+		hostdb = HostDatabase.get(this);
+		pubkeydb = PubkeyDatabase.get(this);
 
 		// load all marked pubkeys into memory
 		updateSavingKeys();
diff --git a/app/src/main/java/org/connectbot/util/PubkeyDatabase.java b/app/src/main/java/org/connectbot/util/PubkeyDatabase.java
index e3ca784..dfa3ef6 100644
--- a/app/src/main/java/org/connectbot/util/PubkeyDatabase.java
+++ b/app/src/main/java/org/connectbot/util/PubkeyDatabase.java
@@ -114,7 +114,7 @@ public class PubkeyDatabase extends RobustSQLiteOpenHelper {
 	 * Delete a specific host by its <code>_id</code> value.
 	 */
 	public void deletePubkey(PubkeyBean pubkey) {
-		HostDatabase hostdb = new HostDatabase(context);
+		HostDatabase hostdb = HostDatabase.get(context);
 		hostdb.stopUsingPubkey(pubkey.getId());
 
 		SQLiteDatabase db = getWritableDatabase();