diff options
author | Kenny Root <kenny@the-b.org> | 2015-09-07 22:15:57 -0700 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-09-07 22:15:57 -0700 |
commit | 57afa9bdc5b269a48bd27fc8455cab4cb956d02a (patch) | |
tree | 86e301f6769a92bf853e8d60b156a4e98f077ecf /app/src/main/java/org/connectbot/HostListActivity.java | |
parent | 747e11c6ff28fc833855b9979ce68a15b99915f6 (diff) | |
download | connectbot-57afa9bdc5b269a48bd27fc8455cab4cb956d02a.tar.gz connectbot-57afa9bdc5b269a48bd27fc8455cab4cb956d02a.tar.bz2 connectbot-57afa9bdc5b269a48bd27fc8455cab4cb956d02a.zip |
Never cache instances of the HostDatabase
Diffstat (limited to 'app/src/main/java/org/connectbot/HostListActivity.java')
-rw-r--r-- | app/src/main/java/org/connectbot/HostListActivity.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 4c0a443..7a4c334 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -72,7 +72,6 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange protected TerminalManager bound = null; - protected HostDatabase hostdb; private List<HostBean> hosts; protected LayoutInflater inflater = null; @@ -125,8 +124,6 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange // start the terminal manager service this.bindService(new Intent(this, TerminalManager.class), connection, Context.BIND_AUTO_CREATE); - - hostdb = HostDatabase.get(this); } @Override @@ -134,8 +131,6 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange super.onStop(); this.unbindService(connection); - hostdb = null; - closeOnDisconnectAll = true; } @@ -206,7 +201,6 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange || Intent.ACTION_PICK.equals(getIntent().getAction()); // connect with hosts database and populate list - this.hostdb = HostDatabase.get(this); ListView list = this.getListView(); this.sortedByColor = prefs.getBoolean(PreferenceConstants.SORT_BY_COLOR, false); @@ -399,7 +393,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange if (bridge != null) bridge.dispatchDisconnect(true); - hostdb.deleteHost(host); + HostDatabase.get(HostListActivity.this).deleteHost(host); updateList(); } }) @@ -460,6 +454,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange return false; } + HostDatabase hostdb = HostDatabase.get(this); HostBean host = TransportFactory.findHost(hostdb, uri); if (host == null) { host = TransportFactory.getTransport(uri.getScheme()).createHost(uri); @@ -485,9 +480,7 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange edit.commit(); } - if (hostdb == null) - hostdb = HostDatabase.get(this); - + HostDatabase hostdb = HostDatabase.get(this); hosts = hostdb.getHosts(sortedByColor); // Don't lose hosts that are connected via shortcuts but not in the database. |