Update pubkey list in onStart instead of onCreate

1 files changed, 3 insertions, 9 deletions

diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java
index 5480cb2..a2cc170 100644
--- a/app/src/main/java/org/connectbot/PubkeyListActivity.java
+++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java
@@ -120,8 +120,8 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 
 		bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE);
 
-		if (pubkeydb == null)
-			pubkeydb = PubkeyDatabase.get(this);
+		pubkeydb = PubkeyDatabase.get(this);
+		updateList();
 	}
 
 	@Override
@@ -142,11 +142,6 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 				getResources().getText(R.string.app_name),
 				getResources().getText(R.string.title_pubkey_list)));
 
-		// connect with hosts database and populate list
-		pubkeydb = PubkeyDatabase.get(this);
-
-		updateList();
-
 		registerForContextMenu(getListView());
 
 		getListView().setOnItemClickListener(new OnItemClickListener() {
@@ -542,8 +537,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 			}
 
 			// write new value into database
-			if (pubkeydb == null)
-				pubkeydb = PubkeyDatabase.get(this);
+			pubkeydb = PubkeyDatabase.get(this);
 			pubkeydb.savePubkey(pubkey);
 
 			updateList();