diff options
author | Kenny Root <kenny@the-b.org> | 2015-09-23 17:58:52 -0700 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-09-23 17:58:52 -0700 |
commit | 170a42c911d0b8a2014073c4e84c3d03a1876534 (patch) | |
tree | 6aa80169e015a286dd49cee0446b057fbb3c1cfb | |
parent | e1ecc6308b3713b940f5e8d1270734d7d1401dfe (diff) | |
parent | 057843e78e2af41909049b9245c834509eecd1aa (diff) | |
download | connectbot-170a42c911d0b8a2014073c4e84c3d03a1876534.tar.gz connectbot-170a42c911d0b8a2014073c4e84c3d03a1876534.tar.bz2 connectbot-170a42c911d0b8a2014073c4e84c3d03a1876534.zip |
Merge pull request #251 from kruton/host-maybe-null
Only use host and pubkey if it is not null
-rw-r--r-- | app/src/main/java/org/connectbot/HostListActivity.java | 17 | ||||
-rw-r--r-- | app/src/main/java/org/connectbot/PubkeyListActivity.java | 7 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index fe5207a..d844c50 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -500,14 +500,17 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta */ private int getConnectedState(HostBean host) { // always disconnected if we don't have backend service - if (this.manager == null) + if (this.manager == null || host == null) { return STATE_UNKNOWN; + } - if (manager.getConnectedBridge(host) != null) + if (manager.getConnectedBridge(host) != null) { return STATE_CONNECTED; + } - if (manager.disconnected.contains(host)) + if (manager.disconnected.contains(host)) { return STATE_DISCONNECTED; + } return STATE_UNKNOWN; } @@ -525,16 +528,14 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta HostViewHolder hostHolder = (HostViewHolder) holder; HostBean host = hosts.get(position); + hostHolder.host = host; if (host == null) { // Well, something bad happened. We can't continue. Log.e("HostAdapter", "Host bean is null!"); - hostHolder.nickname.setText("Error during lookup"); - hostHolder.caption.setText("see 'adb logcat' for more"); + } else { + hostHolder.nickname.setText(host.getNickname()); } - hostHolder.host = host; - - hostHolder.nickname.setText(host.getNickname()); switch (this.getConnectedState(host)) { case STATE_UNKNOWN: diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java index d25411f..9f8521f 100644 --- a/app/src/main/java/org/connectbot/PubkeyListActivity.java +++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java @@ -629,16 +629,15 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi PubkeyViewHolder pubkeyHolder = (PubkeyViewHolder) holder; PubkeyBean pubkey = pubkeys.get(position); + pubkeyHolder.pubkey = pubkey; if (pubkey == null) { // Well, something bad happened. We can't continue. Log.e("PubkeyAdapter", "Pubkey bean is null!"); pubkeyHolder.nickname.setText("Error during lookup"); - pubkeyHolder.caption.setText("see 'adb logcat' for more"); + } else { + pubkeyHolder.nickname.setText(pubkey.getNickname()); } - pubkeyHolder.pubkey = pubkey; - - pubkeyHolder.nickname.setText(pubkey.getNickname()); boolean imported = PubkeyDatabase.KEY_TYPE_IMPORTED.equals(pubkey.getType()); |