aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-09-11 17:37:01 -0700
committerKenny Root <kenny@the-b.org>2015-09-11 17:37:01 -0700
commit705b3461cfa26f074464a32a2642741691340c1f (patch)
tree052fe430778bdd031706bf4aefdabfa4f9bad451 /app/src/main/java
parent85043c9219de3b9d69557b4de61b4a85a19f234a (diff)
downloadconnectbot-705b3461cfa26f074464a32a2642741691340c1f.tar.gz
connectbot-705b3461cfa26f074464a32a2642741691340c1f.tar.bz2
connectbot-705b3461cfa26f074464a32a2642741691340c1f.zip
Fix merge error in PubkeyListActivity
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/org/connectbot/PubkeyListActivity.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java
index a095583..d8a8e70 100644
--- a/app/src/main/java/org/connectbot/PubkeyListActivity.java
+++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java
@@ -134,11 +134,6 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
super.onCreate(icicle);
setContentView(R.layout.act_pubkeylist);
- // connect with hosts database and populate list
- pubkeydb = new PubkeyDatabase(this);
-
- updateList();
-
registerForContextMenu(getListView());
getListView().setOnItemClickListener(new OnItemClickListener() {